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

Merge pull request #20516 from BastiaanOlij/fix_nativescript_getset 

Fixed nativescript getter and setter logic
This commit is contained in:
Rémi Verschelde 2018-07-27 16:54:06 +02:00 committed by GitHub
parent eb17a65dec 8a914f17b0
commit 6afabc0335
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gdnative/nativescript/nativescript.cpp
View File

@ -556,12 +556,17 @@ bool NativeScriptInstance::set(const StringName &p_name, const Variant &p_value)
Variant name = p_name;
const Variant *args[2] = { &name, &p_value };
E->get().method.method((godot_object *)owner,
godot_variant result;
result = E->get().method.method((godot_object *)owner,
E->get().method.method_data,
userdata,
2,
(godot_variant **)args);
return true;
bool handled = *(Variant *)&result;
godot_variant_destroy(&result);
if (handled) {
return true;
}
}
script_data = script_data->base_data;
@ -596,10 +601,9 @@ bool NativeScriptInstance::get(const StringName &p_name, Variant &r_ret) const {
(godot_variant **)args);
r_ret = *(Variant *)&result;
godot_variant_destroy(&result);
if (r_ret.get_type() == Variant::NIL) {
return false;
if (r_ret.get_type() != Variant::NIL) {
return true;
}
return true;
}
script_data = script_data->base_data;