|
|
@@ -112,6 +112,7 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
|
|
|
const NodeData &n = nd[i];
|
|
|
|
|
|
Node *parent = nullptr;
|
|
|
+ String old_parent_path;
|
|
|
|
|
|
if (i > 0) {
|
|
|
ERR_FAIL_COND_V_MSG(n.parent == -1, nullptr, vformat("Invalid scene: node %s does not specify its parent node.", snames[n.name]));
|
|
|
@@ -119,6 +120,8 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
|
|
|
#ifdef DEBUG_ENABLED
|
|
|
if (!nparent && (n.parent & FLAG_ID_IS_PATH)) {
|
|
|
WARN_PRINT(String("Parent path '" + String(node_paths[n.parent & FLAG_MASK]) + "' for node '" + String(snames[n.name]) + "' has vanished when instancing: '" + get_path() + "'.").ascii().get_data());
|
|
|
+ old_parent_path = String(node_paths[n.parent & FLAG_MASK]).trim_prefix("./").replace("/", "@");
|
|
|
+ nparent = ret_nodes[0];
|
|
|
}
|
|
|
#endif
|
|
|
parent = nparent;
|
|
|
@@ -332,6 +335,10 @@ Node *SceneState::instantiate(GenEditState p_edit_state) const {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (!old_parent_path.is_empty()) {
|
|
|
+ node->_set_name_nocheck(old_parent_path + "@" + node->get_name());
|
|
|
+ }
|
|
|
+
|
|
|
if (n.owner >= 0) {
|
|
|
NODE_FROM_ID(owner, n.owner);
|
|
|
if (owner) {
|
kobewi