Merge pull request godotengine#96199 from SaracenOne/ownerless_node_crashfix

akien-mga · akien-mga · commit 35be8acf60b9 · 2024-08-28T09:45:44.000+02:00
Fix crash when selecting ownerless 3D node.
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
@@ -770,7 +770,7 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {
 		}
 	}
 
-	if (p_allow_locked || !_is_node_locked(selected)) {
+	if (p_allow_locked || (selected != nullptr && !_is_node_locked(selected))) {
 		if (clicked_wants_append) {
 			if (editor_selection->is_selected(selected)) {
 				editor_selection->remove_node(selected);

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ void Node3DEditorViewport::_select_clicked(bool p_allow_locked) {`
`770`	`770`	`}`
`771`	`771`	`}`
`772`	`772`
`773`		`- if (p_allow_locked \|\| !_is_node_locked(selected)) {`
	`773`	`+ if (p_allow_locked \|\| (selected != nullptr && !_is_node_locked(selected))) {`
`774`	`774`	`if (clicked_wants_append) {`
`775`	`775`	`if (editor_selection->is_selected(selected)) {`
`776`	`776`	`editor_selection->remove_node(selected);`