Merge pull request #83964 from SaracenOne/skeleton_reimport_crashfix

Fix crash when reimporting with Skeleton3D selected.
godotengine · Oct 26, 2023 · 53a894e · 53a894e
2 parents d298200 + ed083a9
commit 53a894e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/editor/plugins/skeleton_3d_editor_plugin.cpp b/editor/plugins/skeleton_3d_editor_plugin.cpp
@@ -871,7 +871,9 @@ void Skeleton3DEditor::_notification(int p_what) {
 				skeleton->disconnect("pose_updated", callable_mp(this, &Skeleton3DEditor::_update_properties));
 				skeleton->set_transform_gizmo_visible(true);
 #endif
-				handles_mesh_instance->get_parent()->remove_child(handles_mesh_instance);
+				if (handles_mesh_instance->get_parent()) {
+					handles_mesh_instance->get_parent()->remove_child(handles_mesh_instance);
+				}
 			}
 			edit_mode_toggled(false);
 		} break;