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

Merge pull request #18011 from karroffel/nativescript-more-type-tag-fixes 

[NativeScript] replace error macros by simple returns
This commit is contained in:
Rémi Verschelde 2018-04-06 07:55:50 +02:00 committed by GitHub
parent 5d4b9c080a 2e1f239fe6
commit 31fd1b7711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdnative/nativescript/godot_nativescript.cpp
View File

@ -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())