Merge pull request #98014 from SaracenOne/import_subresource_overwrite_fix

akien-mga · akien-mga · commit a3d297ae925f · 2025-06-10T12:29:26.000+02:00
Fix resetting imported scene parameters to default.
diff --git a/editor/import/3d/scene_import_settings.cpp b/editor/import/3d/scene_import_settings.cpp
@@ -1304,9 +1304,7 @@ void SceneImportSettingsDialog::_re_import() {
 		subresources["animations"] = animations;
 	}
 
-	if (subresources.size()) {
-		main_settings["_subresources"] = subresources;
-	}
+	main_settings["_subresources"] = subresources;
 
 	_cleanup(); // Prevent skeletons and other pointers from pointing to dangling references.
 	EditorFileSystem::get_singleton()->reimport_file_with_custom_parameters(base_path, editing_animation ? "animation_library" : "scene", main_settings);

Original file line number	Diff line number	Diff line change
`@@ -1304,9 +1304,7 @@ void SceneImportSettingsDialog::_re_import() {`
`1304`	`1304`	`subresources["animations"] = animations;`
`1305`	`1305`	`}`
`1306`	`1306`
`1307`		`- if (subresources.size()) {`
`1308`		`- main_settings["_subresources"] = subresources;`
`1309`		`- }`
	`1307`	`+ main_settings["_subresources"] = subresources;`
`1310`	`1308`
`1311`	`1309`	`_cleanup(); // Prevent skeletons and other pointers from pointing to dangling references.`
`1312`	`1310`	`EditorFileSystem::get_singleton()->reimport_file_with_custom_parameters(base_path, editing_animation ? "animation_library" : "scene", main_settings);`