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

Merge pull request #8228 from Hinsbart/viewport_fix

Browse source 
Viewport: Fix undefined behaviour found by llvm sanitizer.
This commit is contained in:
Rémi Verschelde 2017-04-02 13:04:14 +02:00 committed by GitHub
commit dee7fb5ab5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/main/viewport.cpp
View file

@ -1401,7 +1401,7 @@ void Viewport::_vp_input(const InputEvent &p_ev) {
return; return;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) { if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) {
return; return;
} }
#endif #endif
@ -1422,7 +1422,7 @@ void Viewport::_vp_unhandled_input(const InputEvent &p_ev) {
if (disable_input) if (disable_input)
return; return;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) { if (get_tree()->is_editor_hint() && get_tree()->get_edited_scene_root() && get_tree()->get_edited_scene_root()->is_a_parent_of(this)) {
return; return;
} }
#endif #endif