asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Print an error if you try to instantiate an editor class outside the editor, fixes #17624

Browse source
This commit is contained in:
Juan Linietsky 2018-09-06 21:07:46 -03:00
parent 74359a1d1e
commit f1e5b7cf42
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/class_db.cpp
View file

@ -30,6 +30,7 @@
#include "class_db.h" #include "class_db.h"
#include "engine.h"
#include "os/mutex.h" #include "os/mutex.h"
#include "version.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->disabled, NULL);
ERR_FAIL_COND_V(!ti->creation_func, 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(); return ti->creation_func();
} }
bool ClassDB::can_instance(const StringName &p_class) { bool ClassDB::can_instance(const StringName &p_class) {