Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Perform a name check when loading scenes and running on editor, fixes #6152 

(cherry picked from commit 200c6cf630)
3.0
Juan Linietsky 2018-07-29 17:39:06 +07:00 committed by Rémi Verschelde
parent 482d60854a
commit a2297c64e6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scene/resources/packed_scene.cpp
Unescape Escape View File

@ -31,6 +31,7 @@
#include "packed_scene.h"
#include "core/core_string_names.h"
#include "engine.h"
#include "io/resource_loader.h"
#include "project_settings.h"
#include "scene/2d/node_2d.h"
@ -277,7 +278,12 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
stray_instances.push_back(node); //can't be added, go to stray list
}
} else {
node->_set_name_nocheck(snames[n.name]);
if (Engine::get_singleton()->is_editor_hint()) {
//validate name if using editor, to avoid broken
node->set_name(snames[n.name]);
} else {
node->_set_name_nocheck(snames[n.name]);
}
}
}