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

Merge pull request #65228 from Mickeon/fix-packed-scene-unique-name-root 

Fix "Save Branch as Scene" storing root Node's `unique_name_in_owner`
This commit is contained in:
Rémi Verschelde 2022-12-05 18:08:10 +01:00
parent 65cbcaeaa5 a2c3b4ea92
commit 6ee3268189
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/scene_tree_dock.cpp
View File

@ -2453,9 +2453,12 @@ void SceneTreeDock::_new_scene_from(String p_file) {
Node *copy = base->duplicate_from_editor(duplimap); Node *copy = base->duplicate_from_editor(duplimap);
if (copy) { if (copy) {
// Handle Unique Nodes.
for (int i = 0; i < copy->get_child_count(false); i++) { for (int i = 0; i < copy->get_child_count(false); i++) {
_set_node_owner_recursive(copy->get_child(i, false), copy); _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> sdata = memnew(PackedScene); Ref<PackedScene> sdata = memnew(PackedScene);
Error err = sdata->pack(copy); Error err = sdata->pack(copy);

24
scene/debugger/scene_debugger.cpp
View File

@ -220,9 +220,31 @@ void SceneDebugger::_save_node(ObjectID id, const String &p_path) {
Node *node = Object::cast_to<Node>(ObjectDB::get_instance(id)); Node *node = Object::cast_to<Node>(ObjectDB::get_instance(id));
ERR_FAIL_COND(!node); 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); Ref<PackedScene> ps = memnew(PackedScene);
ps->pack(node); ps->pack(copy);
ResourceSaver::save(ps, p_path); 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) { void SceneDebugger::_send_object_id(ObjectID p_id, int p_max_size) {

1
scene/debugger/scene_debugger.h
View File

@ -56,6 +56,7 @@ public:
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
private: private:
static void _save_node(ObjectID id, const String &p_path); 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 _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); static void _send_object_id(ObjectID p_id, int p_max_size = 1 << 20);