summaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-06-09 20:43:37 +0200
committerGitHub <noreply@github.com>2016-06-09 20:43:37 +0200
commit1dadaa4db3bbb825dc204536b14831f1042f3fc3 (patch)
tree5e24e2492bc781f62c472e8db02ea9f581e6ee69 /tools/editor
parent990956c4e0db8de0a2031a416e6b8298e25a2ba4 (diff)
parent73b93c9110ec853e12bcde1a26305bd96ed801d4 (diff)
Merge pull request #5123 from zaps166/fix-editorassetlibrary-crash
EditorAssetLibrary: Don't call add_child() on uninitialized pointer
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/asset_library_editor_plugin.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp
index 0b16ca9545..928acdbcbb 100644
--- a/tools/editor/asset_library_editor_plugin.cpp
+++ b/tools/editor/asset_library_editor_plugin.cpp
@@ -1282,8 +1282,6 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
}
- library_vb->add_child(search_hb);
-
HBoxContainer *search_hb2 = memnew( HBoxContainer );
library_main->add_child(search_hb2);