godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Propagate the keying state in the inspector
This commit is contained in:
Rémi Verschelde 2023-01-03 12:34:49 +01:00
parent ccc609d824 ef2c3398e6
commit c774b4ce17
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_inspector.cpp
View File

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

2
editor/editor_properties.cpp
View File

@ -4121,6 +4121,8 @@ 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);