diff options
author | Micky <micheledevita2@gmail.com> | 2022-09-02 07:26:46 +0200 |
---|---|---|
committer | Micky <micheledevita2@gmail.com> | 2022-09-17 11:04:59 +0200 |
commit | a2c3b4ea921a385ab0c59ee807c1ff27bbb38238 (patch) | |
tree | 84b69f864f9597c4de6bd2c2328fd8e86b57650f /scene/debugger | |
parent | 8c7be63588bf3e4ef4b780ff57936c68db5939c7 (diff) |
Fix "Save Branch as Scene" storing root Node's `unique_name_in_owner`
Fix #64425
Diffstat (limited to 'scene/debugger')
-rw-r--r-- | scene/debugger/scene_debugger.cpp | 24 | ||||
-rw-r--r-- | scene/debugger/scene_debugger.h | 1 |
2 files changed, 24 insertions, 1 deletions
diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp index 4c5a63e52c..eea0ee18fa 100644 --- a/scene/debugger/scene_debugger.cpp +++ b/scene/debugger/scene_debugger.cpp @@ -297,9 +297,31 @@ void SceneDebugger::_save_node(ObjectID id, const String &p_path) { Node *node = Object::cast_to<Node>(ObjectDB::get_instance(id)); ERR_FAIL_COND(!node); + HashMap<const Node *, Node *> duplimap; + Node *copy = node->duplicate_from_editor(duplimap); + + // Handle Unique Nodes. + for (int i = 0; i < copy->get_child_count(false); i++) { + _set_node_owner_recursive(copy->get_child(i, false), copy); + } + // Root node cannot ever be unique name in its own Scene! + copy->set_unique_name_in_owner(false); + Ref<PackedScene> ps = memnew(PackedScene); - ps->pack(node); + ps->pack(copy); ResourceSaver::save(ps, p_path); + + memdelete(copy); +} + +void SceneDebugger::_set_node_owner_recursive(Node *p_node, Node *p_owner) { + if (!p_node->get_owner()) { + p_node->set_owner(p_owner); + } + + for (int i = 0; i < p_node->get_child_count(false); i++) { + _set_node_owner_recursive(p_node->get_child(i, false), p_owner); + } } void SceneDebugger::_send_object_id(ObjectID p_id, int p_max_size) { diff --git a/scene/debugger/scene_debugger.h b/scene/debugger/scene_debugger.h index 911363f45d..67426be3bd 100644 --- a/scene/debugger/scene_debugger.h +++ b/scene/debugger/scene_debugger.h @@ -75,6 +75,7 @@ public: #ifdef DEBUG_ENABLED private: static void _save_node(ObjectID id, const String &p_path); + static void _set_node_owner_recursive(Node *p_node, Node *p_owner); static void _set_object_property(ObjectID p_id, const String &p_property, const Variant &p_value); static void _send_object_id(ObjectID p_id, int p_max_size = 1 << 20); |