From eee9e3cd9aef82ae7dde5bcacde2fd1e2d472cf7 Mon Sep 17 00:00:00 2001 From: Silc Renew Date: Wed, 28 Dec 2022 14:54:40 +0900 Subject: Revert "Merge pull request #68498 from Rindbee/improve-update_tree" This reverts commit d5dc70a47871701fc61804b0b75362f5dcdf0055, reversing changes made to ccbefa1f4316c46eed35912e954fdf0e8c88c01a. --- editor/editor_inspector.cpp | 9 +++------ editor/editor_inspector.h | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 9a3eb75416..e07c42e0ab 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -2586,7 +2586,7 @@ bool EditorInspector::_is_property_disabled_by_feature_profile(const StringName return false; } -void EditorInspector::_update_tree() { +void EditorInspector::update_tree() { //to update properly if all is refreshed StringName current_selected = property_selected; int current_focusable = -1; @@ -3305,10 +3305,6 @@ void EditorInspector::_update_tree() { } } -void EditorInspector::update_tree() { - update_tree_pending = true; -} - void EditorInspector::update_property(const String &p_prop) { if (!editor_property_map.has(p_prop)) { return; @@ -3906,9 +3902,10 @@ void EditorInspector::_notification(int p_what) { changing++; if (update_tree_pending) { + update_tree(); update_tree_pending = false; pending.clear(); - _update_tree(); + } else { while (pending.size()) { StringName prop = *pending.begin(); diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 53490f0880..df8493308a 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -542,8 +542,6 @@ class EditorInspector : public ScrollContainer { void _show_add_meta_dialog(); void _check_meta_name(const String &p_name); - void _update_tree(); - protected: static void _bind_methods(); void _notification(int p_what); -- cgit v1.2.3 From 724f2422d7711b2d4adf5deaaf5b58156d977dfe Mon Sep 17 00:00:00 2001 From: Silc Renew Date: Wed, 4 Jan 2023 20:03:28 +0900 Subject: Revert "Merge pull request #70696 from Rindbee/propagate-keying-state" This reverts commit c774b4ce1777d19789bec1cbef100f26c6927777, reversing changes made to ccc609d824802d1d1a20f34bda69ecac75f5a8a1. --- editor/editor_inspector.cpp | 5 +---- editor/editor_properties.cpp | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index e07c42e0ab..9037851127 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -3361,10 +3361,7 @@ void EditorInspector::set_keying(bool p_active) { return; } keying = p_active; - // Propagate the keying state to its editor properties. - Array args; - args.append(keying); - main_vbox->propagate_call(SNAME("set_keying"), args, true); + update_tree(); } void EditorInspector::set_read_only(bool p_read_only) { diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 8c5db444ab..4c9b18efe7 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -4121,8 +4121,6 @@ void EditorPropertyResource::update_property() { if (use_editor) { // Open editor directly and hide other such editors which are currently open. - // The opened editor is the one that edits the sub-resource, so keying state will be toggled to false. - sub_inspector->set_keying(false); _open_editor_pressed(); if (is_inside_tree()) { get_tree()->call_deferred(SNAME("call_group"), "_editor_resource_properties", "_fold_other_editors", this); -- cgit v1.2.3