summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorkarroffel <therzog@mail.de>2018-04-06 01:40:26 +0200
committerkarroffel <therzog@mail.de>2018-04-06 01:40:26 +0200
commit2e1f239fe63aefc4b6f266d1135a734e1fdadfd9 (patch)
treecfe92df2349c6607b2ed4563218123aa710b504f /modules
parenteaa5dfbdbd1217d62902f966496658770638c3d1 (diff)
[NativeScript] replace error macros by simple returns
Diffstat (limited to 'modules')
-rw-r--r--modules/gdnative/nativescript/godot_nativescript.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/gdnative/nativescript/godot_nativescript.cpp b/modules/gdnative/nativescript/godot_nativescript.cpp
index 593ff34a62..ace2ecac5c 100644
--- a/modules/gdnative/nativescript/godot_nativescript.cpp
+++ b/modules/gdnative/nativescript/godot_nativescript.cpp
@@ -339,13 +339,11 @@ const void GDAPI *godot_nativescript_get_type_tag(const godot_object *p_object)
const Object *o = (Object *)p_object;
if (!o->get_script_instance()) {
- ERR_EXPLAIN("Attempted to get type tag on an object without a script!");
- ERR_FAIL_V(NULL);
+ return NULL;
} else {
NativeScript *script = Object::cast_to<NativeScript>(o->get_script_instance()->get_script().ptr());
if (!script) {
- ERR_EXPLAIN("Attempted to get type tag on an object without a nativescript attached");
- ERR_FAIL_V(NULL);
+ return NULL;
}
if (script->get_script_desc())