From f1e5b7cf42010db1251ecef34695367c125f02e1 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 6 Sep 2018 21:07:46 -0300 Subject: Print an error if you try to instantiate an editor class outside the editor, fixes #17624 --- core/class_db.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/class_db.cpp b/core/class_db.cpp index 03b214aa41..eceefa1ee4 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -30,6 +30,7 @@ #include "class_db.h" +#include "engine.h" #include "os/mutex.h" #include "version.h" @@ -512,7 +513,12 @@ Object *ClassDB::instance(const StringName &p_class) { ERR_FAIL_COND_V(ti->disabled, NULL); ERR_FAIL_COND_V(!ti->creation_func, NULL); } - +#ifdef TOOLS_ENABLED + if (ti->api == API_EDITOR && !Engine::get_singleton()->is_editor_hint()) { + ERR_PRINTS("Class '" + String(p_class) + "' can only be instantiated by editor."); + return NULL; + } +#endif return ti->creation_func(); } bool ClassDB::can_instance(const StringName &p_class) { -- cgit v1.2.3