Perform a name check when loading scenes and running on editor, fixes #6152
(cherry picked from commit 200c6cf630
)
This commit is contained in:
parent
482d60854a
commit
a2297c64e6
|
@ -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"
|
||||
|
@ -276,10 +277,15 @@ Node *SceneState::instance(GenEditState p_edit_state) const {
|
|||
//and the node has nowhere to go anymore
|
||||
stray_instances.push_back(node); //can't be added, go to stray list
|
||||
}
|
||||
} else {
|
||||
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]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (n.owner >= 0) {
|
||||
|
||||
|
|
Loading…
Reference in New Issue