Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #113353 from SatLess/oversight

Browse source 
Prevent double counting and cyclical error when gathering Resources
This commit is contained in:
Rémi Verschelde 2025-12-01 13:38:29 +01:00
commit ad54cd4032
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
editor/editor_node.cpp
View file

@ -1815,7 +1815,9 @@ void EditorNode::gather_resources(const Variant &p_variant, List<Ref<Resource>>
r_list.push_back(res);
}
}
gather_resources(v, r_list, p_subresources, p_allow_external);
if (Object::cast_to<Node>(v) == nullptr) {
gather_resources(v, r_list, p_subresources, p_allow_external);
}
}
return;
}
@ -1839,8 +1841,12 @@ void EditorNode::gather_resources(const Variant &p_variant, List<Ref<Resource>>
r_list.push_back(res_value);
}
}
gather_resources(kv.key, r_list, p_subresources, p_allow_external);
gather_resources(kv.value, r_list, p_subresources, p_allow_external);
if (Object::cast_to<Node>(kv.key) == nullptr) {
gather_resources(kv.key, r_list, p_subresources, p_allow_external);
}
if (Object::cast_to<Node>(kv.value) == nullptr) {
gather_resources(kv.value, r_list, p_subresources, p_allow_external);
}
}
return;
}
@ -1855,12 +1861,10 @@ void EditorNode::gather_resources(const Variant &p_variant, List<Ref<Resource>>
Variant property_value = p_variant.get(E.name);
Variant::Type property_type = property_value.get_type();
if (property_type == Variant::ARRAY || property_type == Variant::DICTIONARY) {
gather_resources(property_value, r_list, p_subresources, p_allow_external);
continue;
}
Ref<Resource> res = property_value;
if (res.is_null()) {
continue;

4
editor/inspector/editor_inspector.cpp
View file

@ -5182,9 +5182,9 @@ void EditorInspector::_edit_set(const String &p_name, const Variant &p_value, bo
} else {
undo_redo->add_undo_property(object, p_name, value);
}
// We'll use Editor Selection to get the currently edited Node.
Node *N = Object::cast_to<Node>(object);
if (N && (type == Variant::OBJECT || type == Variant::ARRAY || type == Variant::DICTIONARY) && value != p_value) {
bool double_counting = Object::cast_to<Node>(p_value) == N || Object::cast_to<Node>(value) == N;
if (N && !double_counting && (type == Variant::OBJECT || type == Variant::ARRAY || type == Variant::DICTIONARY) && value != p_value) {
undo_redo->add_do_method(EditorNode::get_singleton(), "update_node_reference", value, N, true);
undo_redo->add_do_method(EditorNode::get_singleton(), "update_node_reference", p_value, N, false);
// Perhaps an inefficient way of updating the resource count.