Browse Source

[NativeScript] forgot to uncomment userdata return

Karroffel 8 years ago
parent
commit
41eb8a0279

+ 1 - 1
modules/nativescript/godot_nativescript.cpp

@@ -195,7 +195,7 @@ void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance) {
 	if (!instance)
 		return NULL;
 	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;
 }

+ 2 - 2
modules/nativescript/nativescript.h

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