Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't mark cached previously pinned AnimationMixers

Browse source 
AnimationPlayerEditor will hold on to pointers to no-longer existing
Nodes that were previously pinned. Make sure to not mark them as dirty
if they are not already inside the cache.

This fixes #102108
This commit is contained in:
HP van Braam 2025-02-13 17:50:59 +01:00
parent c2732ae4b6
commit 0b30ecc758
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
editor/gui/scene_tree_editor.cpp
View file

@ -924,12 +924,19 @@ void SceneTreeEditor::_update_tree(bool p_scroll_to_selected) {
// If pinned state changed, update the currently pinned node. // If pinned state changed, update the currently pinned node.
if (AnimationPlayerEditor::get_singleton()->is_pinned() != node_cache.current_has_pin) { if (AnimationPlayerEditor::get_singleton()->is_pinned() != node_cache.current_has_pin) {
node_cache.current_has_pin = AnimationPlayerEditor::get_singleton()->is_pinned(); node_cache.current_has_pin = AnimationPlayerEditor::get_singleton()->is_pinned();
if (node_cache.has(pinned_node)) {
node_cache.mark_dirty(pinned_node); node_cache.mark_dirty(pinned_node);
} }
}
// If the current pinned node changed update both the old and new node. // If the current pinned node changed update both the old and new node.
if (node_cache.current_pinned_node != pinned_node) { if (node_cache.current_pinned_node != pinned_node) {
// get_editing_node() will return deleted nodes. If the nodes are not in cache don't try to mark them.
if (node_cache.has(pinned_node)) {
node_cache.mark_dirty(pinned_node); node_cache.mark_dirty(pinned_node);
}
if (node_cache.has(node_cache.current_pinned_node)) {
node_cache.mark_dirty(node_cache.current_pinned_node); node_cache.mark_dirty(node_cache.current_pinned_node);
}
node_cache.current_pinned_node = pinned_node; node_cache.current_pinned_node = pinned_node;
} }
@ -2373,6 +2380,10 @@ HashMap<Node *, SceneTreeEditor::CachedNode>::Iterator SceneTreeEditor::NodeCach
return I; return I;
} }
bool SceneTreeEditor::NodeCache::has(Node *p_node) {
return get(p_node, false).operator bool();
}
void SceneTreeEditor::NodeCache::remove(Node *p_node, bool p_recursive) { void SceneTreeEditor::NodeCache::remove(Node *p_node, bool p_recursive) {
if (!p_node) { if (!p_node) {
return; return;
@ -2382,6 +2393,11 @@ void SceneTreeEditor::NodeCache::remove(Node *p_node, bool p_recursive) {
editor->selected = nullptr; editor->selected = nullptr;
} }
if (p_node == current_pinned_node) {
current_pinned_node = nullptr;
current_has_pin = false;
}
editor->marked.erase(p_node); editor->marked.erase(p_node);
HashMap<Node *, CachedNode>::Iterator I = cache.find(p_node); HashMap<Node *, CachedNode>::Iterator I = cache.find(p_node);
@ -2419,6 +2435,7 @@ void SceneTreeEditor::NodeCache::mark_dirty(Node *p_node, bool p_parents) {
if (!p_parents) { if (!p_parents) {
break; break;
} }
node = node->get_parent(); node = node->get_parent();
} }
} }
@ -2483,4 +2500,6 @@ void SceneTreeEditor::NodeCache::clear() {
} }
cache.clear(); cache.clear();
to_delete.clear(); to_delete.clear();
current_pinned_node = nullptr;
current_has_pin = false;
} }

1
editor/gui/scene_tree_editor.h
View file

@ -90,6 +90,7 @@ class SceneTreeEditor : public Control {
HashMap<Node *, CachedNode>::Iterator add(Node *p_node, TreeItem *p_item); HashMap<Node *, CachedNode>::Iterator add(Node *p_node, TreeItem *p_item);
HashMap<Node *, CachedNode>::Iterator get(Node *p_node, bool p_deleted_ok = true); HashMap<Node *, CachedNode>::Iterator get(Node *p_node, bool p_deleted_ok = true);
bool has(Node *p_node);
void remove(Node *p_node, bool p_recursive = false); void remove(Node *p_node, bool p_recursive = false);
void mark_dirty(Node *p_node, bool p_parents = true); void mark_dirty(Node *p_node, bool p_parents = true);
void mark_children_dirty(Node *p_node, bool p_recursive = false); void mark_children_dirty(Node *p_node, bool p_recursive = false);