godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preventing an editor crash in the event that a plugin scene's root-node is null. 

(cherry picked from commit 2adfdbe184)
This commit is contained in:
Michael Lee 2018-06-27 18:06:39 -05:00 committed by Hein-Pieter van Braam
parent d3a482ab65
commit 00fa61f8f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_plugin.cpp
View File

@ -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) { 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); 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) { void EditorPlugin::add_control_to_container(CustomControlContainer p_location, Control *p_control) {
ERR_FAIL_NULL(p_control);
switch (p_location) { 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) { void EditorPlugin::remove_control_from_container(CustomControlContainer p_location, Control *p_control) {
ERR_FAIL_NULL(p_control);
switch (p_location) { switch (p_location) {