From 3d1c03187132677800b7f6bc609eeef8fe51f315 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Wed, 23 Aug 2017 19:10:32 -0300
Subject: Changed MethodBind API to request information from methods. It's much
 claner now. Also changed PropertyInfo to include informatino about class
 names.

---
 core/class_db.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'core/class_db.cpp')

diff --git a/core/class_db.cpp b/core/class_db.cpp
index 6cd7586a5..ff31ea7b0 100644
--- a/core/class_db.cpp
+++ b/core/class_db.cpp
@@ -538,9 +538,7 @@ void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, b
 				minfo.arguments.push_back(method->get_argument_info(i));
 			}
 
-			if (method->get_argument_type(-1) != Variant::NIL) {
-				minfo.return_val = method->get_argument_info(-1);
-			}
+			minfo.return_val = method->get_return_info();
 
 			minfo.flags = method->get_hint_flags();
 			p_methods->push_back(minfo);
@@ -680,7 +678,7 @@ StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const S
 			List<StringName> &constants_list = type->enum_map.get(*k);
 			const List<StringName>::Element *found = constants_list.find(p_name);
 			if (found)
-				return found->get();
+				return *k;
 		}
 
 		if (p_no_inheritance)
-- 
cgit v1.2.3-70-g09d2