godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[bugfix] Fix reimporting scene withh default values selected 

This commit fixes #78140

When the scene was re-imported with non-default values of some settings, re-importing it again using default values for those settings didn't have the effect.

The problem was that when handling the reimport, a wrong dictionary of the settings was used.

(cherry picked from commit 8b729e5b7e)
This commit is contained in:
Kirill Diduk 2023-07-26 00:06:15 +02:00 committed by Yuri Sizov
parent 67e1849bd4
commit eaa2485a5d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/import/scene_import_settings.cpp
View File

@ -927,7 +927,7 @@ void SceneImportSettings::_viewport_input(const Ref<InputEvent> &p_input) {
void SceneImportSettings::_re_import() { void SceneImportSettings::_re_import() {
HashMap<StringName, Variant> main_settings; HashMap<StringName, Variant> main_settings;
main_settings = defaults; main_settings = scene_import_settings_data->current;
main_settings.erase("_subresources"); main_settings.erase("_subresources");
Dictionary nodes; Dictionary nodes;
Dictionary materials; Dictionary materials;