Ver Fonte

fix crash after click on MeshInstance with no owner

Due to how spatial selection works, after clicking on
MeshInstance that had no owner editor was crashing.
Jakub Grzesik há 8 anos atrás
pai
commit
be8ae8df93
1 ficheiros alterados com 2 adições e 2 exclusões
  1. 2 2
      editor/plugins/spatial_editor_plugin.cpp

+ 2 - 2
editor/plugins/spatial_editor_plugin.cpp

@@ -285,11 +285,11 @@ ObjectID SpatialEditorViewport::_select_ray(const Point2 &p_pos, bool p_append,
 
 			Node *subscene_candidate = spat;
 
-			while (subscene_candidate->get_owner() != editor->get_edited_scene())
+			while ((subscene_candidate->get_owner() != NULL) && (subscene_candidate->get_owner() != editor->get_edited_scene()))
 				subscene_candidate = subscene_candidate->get_owner();
 
 			spat = subscene_candidate->cast_to<Spatial>();
-			if (spat && (spat->get_filename() != ""))
+			if (spat && (spat->get_filename() != "") && (subscene_candidate->get_owner() != NULL))
 				subscenes.push_back(spat);
 
 			continue;