Merge pull request #107067 from nikitalita/fix-reload-scene-segfault

Fix scene reload causing segfaults when non-existent node is currently selected
This commit is contained in:
Thaddeus Crews
2025-06-18 18:13:49 -05:00

View File

@@ -2571,7 +2571,7 @@ void EditorNode::edit_item(Object *p_object, Object *p_editing_owner) {
}
void EditorNode::push_node_item(Node *p_node) {
if (p_node || Object::cast_to<Node>(InspectorDock::get_inspector_singleton()->get_edited_object()) || Object::cast_to<MultiNodeEdit>(InspectorDock::get_inspector_singleton()->get_edited_object())) {
if (p_node || !InspectorDock::get_inspector_singleton()->get_edited_object() || Object::cast_to<Node>(InspectorDock::get_inspector_singleton()->get_edited_object()) || Object::cast_to<MultiNodeEdit>(InspectorDock::get_inspector_singleton()->get_edited_object())) {
// Don't push null if the currently edited object is not a Node.
push_item(p_node);
}