From 38059b5dbbca606fea1de53b3602ad6ec2835bd5 Mon Sep 17 00:00:00 2001 From: debian build Date: Wed, 18 Sep 2024 20:05:57 +0000 Subject: [PATCH] Patches --- drivers/gles3/shaders/tonemap_inc.glsl | 4 ---- editor/project_manager.cpp | 4 ++-- editor/project_manager.h | 1 + platform/windows/detect.py | 2 +- scene/3d/lightmap_gi.cpp | 2 -- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/gles3/shaders/tonemap_inc.glsl b/drivers/gles3/shaders/tonemap_inc.glsl index 909f790180..d80e069600 100644 --- a/drivers/gles3/shaders/tonemap_inc.glsl +++ b/drivers/gles3/shaders/tonemap_inc.glsl @@ -33,10 +33,6 @@ vec3 tonemap_reinhard(vec3 color, float p_white) { return (p_white * color + color) / (color * p_white + p_white); } -vec3 tonemap_reinhard(vec3 color, float p_white) { - return (p_white * color + color) / (color * p_white + p_white); -} - vec3 tonemap_filmic(vec3 color, float p_white) { // exposure bias: input scale (color *= bias, white *= bias) to make the brightness consistent with other tonemappers // also useful to scale the input to the range that the tonemapper is designed for (some require very high input values) diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 33ecd3fead..89416da993 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -635,14 +635,14 @@ void ProjectManager::_open_selected_projects_check_safe_mode(bool p_safe_mode) { _open_selected_projects_check_warnings(p_safe_mode); } -void ProjectManager::_open_selected_projects_with_migration() { +void ProjectManager::_open_selected_projects_with_migration(bool p_safe_mode) { #ifndef DISABLE_DEPRECATED if (project_list->get_selected_projects().size() == 1) { // Only migrate if a single project is opened. _minor_project_migrate(); } #endif - _open_selected_projects(); + _open_selected_projects(p_safe_mode); } void ProjectManager::_install_project(const String &p_zip_path, const String &p_title) { diff --git a/editor/project_manager.h b/editor/project_manager.h index 2310ccb47c..15f0cfa76a 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -183,6 +183,7 @@ class ProjectManager : public Control { void _open_selected_projects(bool p_safe_mode); void _open_selected_projects_check_warnings(bool p_safe_mode); void _open_selected_projects_check_safe_mode(bool p_safe_mode); + void _open_selected_projects_with_migration(bool p_safe_mode); void _install_project(const String &p_zip_path, const String &p_title); void _import_project(); diff --git a/platform/windows/detect.py b/platform/windows/detect.py index db4c743595..d5aaac1dd0 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -741,7 +741,7 @@ def configure_mingw(env: "SConsEnvironment"): # TODO: Re-evaluate the need for this / streamline with common config. if env["target"] == "template_release": - if env["arch"] != "arm64": + if env["arch"].startswith("x86"): env.Append(CCFLAGS=["-msse2"]) elif env.dev_build: # Allow big objects. It's supposed not to have drawbacks but seems to break diff --git a/scene/3d/lightmap_gi.cpp b/scene/3d/lightmap_gi.cpp index 2964aa4de3..f1a42cd4d0 100644 --- a/scene/3d/lightmap_gi.cpp +++ b/scene/3d/lightmap_gi.cpp @@ -986,11 +986,9 @@ LightmapGI::BakeError LightmapGI::bake(Node *p_from_node, String p_image_data_pa LightmapGI::BakeQuality effective_bake_quality = bake_quality; int effective_bounces = bounces; - float effective_texel_scale = texel_scale; LightmapGI::GenerateProbes effective_gen_probes = gen_probes; if (p_preview_bake) { // Use lower-quality settings for quick iteration. - effective_texel_scale *= float(GLOBAL_GET("rendering/lightmapping/preview_bake/texel_scale_factor")); effective_bake_quality = MIN(bake_quality, LightmapGI::BakeQuality(int(GLOBAL_GET("rendering/lightmapping/preview_bake/max_quality")))); effective_bounces = MIN(bounces, int(GLOBAL_GET("rendering/lightmapping/preview_bake/max_bounces"))); effective_gen_probes = MIN(gen_probes, LightmapGI::GenerateProbes(int(GLOBAL_GET("rendering/lightmapping/preview_bake/generate_probes_max_subdiv"))));