You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-10 13:00:37 +00:00
Merge pull request #101145 from hpvb/fix-scenetree-editor-marked
Make sure marked nodes are reset on scene change
This commit is contained in:
@@ -897,6 +897,15 @@ void SceneTreeEditor::_update_tree(bool p_scroll_to_selected) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Node *scene_node = get_scene_node();
|
||||||
|
|
||||||
|
if (node_cache.current_scene_node != scene_node) {
|
||||||
|
_reset();
|
||||||
|
marked.clear();
|
||||||
|
node_cache.current_scene_node = scene_node;
|
||||||
|
node_cache.force_update = true;
|
||||||
|
}
|
||||||
|
|
||||||
if (!update_when_invisible && !is_visible_in_tree()) {
|
if (!update_when_invisible && !is_visible_in_tree()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -908,13 +917,6 @@ void SceneTreeEditor::_update_tree(bool p_scroll_to_selected) {
|
|||||||
updating_tree = true;
|
updating_tree = true;
|
||||||
|
|
||||||
last_hash = hash_djb2_one_64(0);
|
last_hash = hash_djb2_one_64(0);
|
||||||
Node *scene_node = get_scene_node();
|
|
||||||
|
|
||||||
if (node_cache.current_scene_node != scene_node) {
|
|
||||||
_reset();
|
|
||||||
node_cache.current_scene_node = scene_node;
|
|
||||||
node_cache.force_update = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node_cache.current_scene_node) {
|
if (node_cache.current_scene_node) {
|
||||||
// Handle pinning/unpinning the animation player only do this once per iteration.
|
// Handle pinning/unpinning the animation player only do this once per iteration.
|
||||||
|
|||||||
Reference in New Issue
Block a user