diff options
| author | Silc Renew <tokage.it.lab@gmail.com> | 2023-01-04 20:03:28 +0900 |
|---|---|---|
| committer | Silc Renew <tokage.it.lab@gmail.com> | 2023-01-04 20:03:28 +0900 |
| commit | 724f2422d7711b2d4adf5deaaf5b58156d977dfe (patch) | |
| tree | 44aefc3a1dd122800af05494bb8ac0cb5e55b152 /editor | |
| parent | eee9e3cd9aef82ae7dde5bcacde2fd1e2d472cf7 (diff) | |
Revert "Merge pull request #70696 from Rindbee/propagate-keying-state"
This reverts commit c774b4ce1777d19789bec1cbef100f26c6927777, reversing
changes made to ccc609d824802d1d1a20f34bda69ecac75f5a8a1.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_inspector.cpp | 5 | ||||
| -rw-r--r-- | editor/editor_properties.cpp | 2 |
2 files changed, 1 insertions, 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); |