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

[NativeScript] forgot to uncomment userdata return

Browse source
This commit is contained in:
Karroffel 2017-07-24 16:36:26 +02:00
parent a1a76bbde4
commit 41eb8a0279
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/nativescript/godot_nativescript.cpp
View file

@ -195,7 +195,7 @@ void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance) {
if (!instance) if (!instance)
return NULL; return NULL;
if (instance->get_script_instance() && instance->get_script_instance()->get_language() == NativeScriptLanguage::get_singleton()) { if (instance->get_script_instance() && instance->get_script_instance()->get_language() == NativeScriptLanguage::get_singleton()) {
// return ((NativeScriptInstance *)instance->get_script_instance())->get_userdata(); return ((NativeScriptInstance *)instance->get_script_instance())->userdata;
} }
return NULL; return NULL;
} }

4
modules/nativescript/nativescript.h
View file

@ -160,11 +160,11 @@ class NativeScriptInstance : public ScriptInstance {
Object *owner; Object *owner;
Ref<NativeScript> script; Ref<NativeScript> script;
void *userdata;
void _ml_call_reversed(NativeScriptDesc *script_data, const StringName &p_method, const Variant **p_args, int p_argcount); void _ml_call_reversed(NativeScriptDesc *script_data, const StringName &p_method, const Variant **p_args, int p_argcount);
public: public:
void *userdata;
virtual bool set(const StringName &p_name, const Variant &p_value); virtual bool set(const StringName &p_name, const Variant &p_value);
virtual bool get(const StringName &p_name, Variant &r_ret) const; virtual bool get(const StringName &p_name, Variant &r_ret) const;
virtual void get_property_list(List<PropertyInfo> *p_properties) const; virtual void get_property_list(List<PropertyInfo> *p_properties) const;