Patches

Sunfly-Studios · Sep 18, 2024 · f8a54db · f8a54db
1 parent ac43141
commit f8a54db
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -723,7 +723,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
@@ -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"))));