1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00

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.
This commit is contained in:
Jakub Grzesik
2017-08-11 19:59:30 +02:00
parent 23f6d3fa69
commit be8ae8df93

View File

@@ -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;