From 00fa61f8f5d9d64eadf7a54cd1c18d89a62d9b64 Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Wed, 27 Jun 2018 18:06:39 -0500 Subject: [PATCH] Preventing an editor crash in the event that a plugin scene's root-node is null. (cherry picked from commit 2adfdbe18410a048b93f27fdcdbe17f7ac0d1015) --- editor/editor_plugin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 7ab52cf13cf..6723ea3f74b 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -302,7 +302,7 @@ void EditorPlugin::remove_custom_type(const String &p_type) { } ToolButton *EditorPlugin::add_control_to_bottom_panel(Control *p_control, const String &p_title) { - + ERR_FAIL_NULL_V(p_control, NULL); return EditorNode::get_singleton()->add_bottom_panel_item(p_title, p_control); } @@ -325,6 +325,7 @@ void EditorPlugin::remove_control_from_bottom_panel(Control *p_control) { } void EditorPlugin::add_control_to_container(CustomControlContainer p_location, Control *p_control) { + ERR_FAIL_NULL(p_control); switch (p_location) { @@ -374,6 +375,7 @@ void EditorPlugin::add_control_to_container(CustomControlContainer p_location, C } void EditorPlugin::remove_control_from_container(CustomControlContainer p_location, Control *p_control) { + ERR_FAIL_NULL(p_control); switch (p_location) {