asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Revert "Merge pull request #70696 from Rindbee/propagate-keying-state"

Browse source 
This reverts commit c774b4ce17, reversing
changes made to ccc609d824.
This commit is contained in:
Silc Renew 2023-01-04 20:03:28 +09:00
parent eee9e3cd9a
commit 724f2422d7
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/editor_inspector.cpp
View file

@ -3361,10 +3361,7 @@ void EditorInspector::set_keying(bool p_active) {
return; return;
} }
keying = p_active; keying = p_active;
// Propagate the keying state to its editor properties. update_tree();
Array args;
args.append(keying);
main_vbox->propagate_call(SNAME("set_keying"), args, true);
} }
void EditorInspector::set_read_only(bool p_read_only) { void EditorInspector::set_read_only(bool p_read_only) {

2
editor/editor_properties.cpp
View file

@ -4121,8 +4121,6 @@ void EditorPropertyResource::update_property() {
if (use_editor) { if (use_editor) {
// Open editor directly and hide other such editors which are currently open. // 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(); _open_editor_pressed();
if (is_inside_tree()) { if (is_inside_tree()) {
get_tree()->call_deferred(SNAME("call_group"), "_editor_resource_properties", "_fold_other_editors", this); get_tree()->call_deferred(SNAME("call_group"), "_editor_resource_properties", "_fold_other_editors", this);