summaryrefslogtreecommitdiff
path: root/editor/editor_node.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-08-17 13:31:08 +0200
committerGitHub <noreply@github.com>2019-08-17 13:31:08 +0200
commitde4aabe89b7b68677f145f21c956183bbc92f686 (patch)
tree20b2e819d599d6d1bd459bb51880c31e97cfe825 /editor/editor_node.cpp
parent40640a01dc90be00e55e4eef3c7800401ef63b18 (diff)
parent71d71d55b5c0d6da4d1555823ac432bf0b33389a (diff)
Merge pull request #31244 from Unholydeath/BB_ChangeErrorMacros
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/'
Diffstat (limited to 'editor/editor_node.cpp')
-rw-r--r--editor/editor_node.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index bc2ac01af8..1b0ffd4c89 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -2795,8 +2795,7 @@ void EditorNode::select_editor_by_name(const String &p_name) {
}
}
- ERR_EXPLAIN("The editor name '" + p_name + "' was not found.");
- ERR_FAIL();
+ ERR_FAIL_MSG("The editor name '" + p_name + "' was not found.");
}
void EditorNode::add_editor_plugin(EditorPlugin *p_editor, bool p_config_changed) {
@@ -4797,8 +4796,7 @@ void EditorNode::remove_control_from_dock(Control *p_control) {
}
}
- ERR_EXPLAIN("Control was not in dock");
- ERR_FAIL_COND(!dock);
+ ERR_FAIL_COND_MSG(!dock, "Control was not in dock.");
dock->remove_child(p_control);
_update_dock_slots_visibility();