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

Merge pull request #90816 from kitbdev/dock-dont-edit-current 

Don't edit current when changing docks
This commit is contained in:
Rémi Verschelde 2024-04-22 12:53:00 +02:00
parent 6cf03a5bbb 55711b2ee8
commit 8ab5ab19c3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_dock_manager.cpp
View File

@ -147,7 +147,6 @@ void EditorDockManager::_update_layout() {
if (!dock_context_popup->is_inside_tree() || EditorNode::get_singleton()->is_exiting()) {
return;
}
EditorNode::get_singleton()->edit_current();
dock_context_popup->docks_updated();
_update_docks_menu();
EditorNode::get_singleton()->save_editor_layout_delayed();

7
editor/editor_inspector.cpp
View File

@ -3477,7 +3477,9 @@ void EditorInspector::edit(Object *p_object) {
next_object = p_object; // Some plugins need to know the next edited object when clearing the inspector.
if (object) {
_clear();
object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback));
if (object->is_connected("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback))) {
object->disconnect("property_list_changed", callable_mp(this, &EditorInspector::_changed_callback));
}
}
per_array_page.clear();
@ -4019,14 +4021,13 @@ void EditorInspector::_notification(int p_what) {
} break;
case NOTIFICATION_PREDELETE: {
edit(nullptr); //just in case
edit(nullptr);
} break;
case NOTIFICATION_EXIT_TREE: {
if (!sub_inspector) {
get_tree()->disconnect("node_removed", callable_mp(this, &EditorInspector::_node_removed));
}
edit(nullptr);
} break;
case NOTIFICATION_VISIBILITY_CHANGED: {