summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-12-10 23:01:54 +0100
committerGitHub <noreply@github.com>2017-12-10 23:01:54 +0100
commit40250c2434bd75610d6b42742e116624f66ce67e (patch)
tree2a37cf7e9495651131b91048829d78cafd3b9278
parentaa5f5191f0e1d7704bf439bbdf41077ce6a61c66 (diff)
parentcad2fc7ba923f492e4625e02b7cc23500949e9e8 (diff)
Merge pull request #14529 from Smjert/fix/scene-tree-editor-crash
Fix SceneTreeEditor crashing when calling _deselect_items
-rw-r--r--editor/scene_tree_editor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index 2c0981ca30..25924212fd 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -484,7 +484,8 @@ void SceneTreeEditor::_selected_changed() {
void SceneTreeEditor::_deselect_items() {
// Clear currently elected items in scene tree dock.
- editor_selection->clear();
+ if (editor_selection)
+ editor_selection->clear();
}
void SceneTreeEditor::_cell_multi_selected(Object *p_object, int p_cell, bool p_selected) {