Browse Source

_get return type fix

Ramesh Ravone 8 years ago
parent
commit
826c51c70e
2 changed files with 3 additions and 1 deletions
  1. 1 1
      core/object.cpp
  2. 2 0
      modules/gdnative/api_generator.cpp

+ 1 - 1
core/object.cpp

@@ -1723,7 +1723,7 @@ void Object::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_set", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::NIL, "value")));
 	BIND_VMETHOD(MethodInfo("_set", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::NIL, "value")));
 #ifdef TOOLS_ENABLED
 #ifdef TOOLS_ENABLED
 	MethodInfo miget("_get", PropertyInfo(Variant::STRING, "property"));
 	MethodInfo miget("_get", PropertyInfo(Variant::STRING, "property"));
-	miget.return_val.name = "var";
+	miget.return_val.name = "Variant";
 	BIND_VMETHOD(miget);
 	BIND_VMETHOD(miget);
 
 
 	MethodInfo plget("_get_property_list");
 	MethodInfo plget("_get_property_list");

+ 2 - 0
modules/gdnative/api_generator.cpp

@@ -268,6 +268,8 @@ List<ClassAPI> generate_c_api_classes() {
 					method_api.method_name = method_api.method_name.get_slice(":", 0);
 					method_api.method_name = method_api.method_name.get_slice(":", 0);
 				} else if (m->get().return_val.type != Variant::NIL) {
 				} else if (m->get().return_val.type != Variant::NIL) {
 					method_api.return_type = m->get().return_val.hint == PROPERTY_HINT_RESOURCE_TYPE ? m->get().return_val.hint_string : Variant::get_type_name(m->get().return_val.type);
 					method_api.return_type = m->get().return_val.hint == PROPERTY_HINT_RESOURCE_TYPE ? m->get().return_val.hint_string : Variant::get_type_name(m->get().return_val.type);
+				} else if (m->get().return_val.name != "") {
+					method_api.return_type = m->get().return_val.name;
 				} else {
 				} else {
 					method_api.return_type = "void";
 					method_api.return_type = "void";
 				}
 				}