asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #10258 from kubecz3k/spatial-select-no-owner-fix

Browse source 
fix crash after click on MeshInstance with no owner
This commit is contained in:
Rémi Verschelde 2017-08-13 17:18:12 +02:00 committed by GitHub
commit 1ec6300421
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/spatial_editor_plugin.cpp
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;