godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases 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
parent 39c7479839 8b79e94fb6
commit ad54cd4032
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.