1 files changed, 16 insertions, 7 deletions

diff --git a/core/class_db.cpp b/core/class_db.cpp
index ff31ea7b0..cd55219b5 100644
--- a/core/class_db.cpp
+++ b/core/class_db.cpp
@@ -598,14 +598,23 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
 
 	type->constant_map[p_name] = p_constant;
 #ifdef DEBUG_METHODS_ENABLED
-	List<StringName> *constants_list = type->enum_map.getptr(p_enum);
 
-	if (constants_list) {
-		constants_list->push_back(p_name);
-	} else {
-		List<StringName> new_list;
-		new_list.push_back(p_name);
-		type->enum_map[p_enum] = new_list;
+	String enum_name = p_enum;
+	if (enum_name!=String()) {
+		if (enum_name.find(".")!=-1) {
+			enum_name=enum_name.get_slicec('.',1);
+		}
+
+		List<StringName> *constants_list = type->enum_map.getptr(enum_name);
+
+		if (constants_list) {
+			constants_list->push_back(p_name);
+		} else {
+			List<StringName> new_list;
+			new_list.push_back(p_name);
+			type->enum_map[enum_name] = new_list;
+		}
+
 	}
 
 	type->constant_order.push_back(p_name);