Browse Source

Merge pull request #36295 from akien-mga/classdb-workaround-gdscript-double-free

ClassDB: Workaround double-free for GDScript
Rémi Verschelde 5 years ago
parent
commit
fb8c93c10b
1 changed files with 4 additions and 1 deletions
  1. 4 1
      core/class_db.cpp

+ 4 - 1
core/class_db.cpp

@@ -1410,7 +1410,10 @@ Variant ClassDB::class_get_default_property_value(const StringName &p_class, con
 			cleanup_c = false;
 			cleanup_c = false;
 		} else if (ClassDB::can_instance(p_class)) {
 		} else if (ClassDB::can_instance(p_class)) {
 			c = ClassDB::instance(p_class);
 			c = ClassDB::instance(p_class);
-			cleanup_c = true;
+#ifndef _MSC_VER
+#warning FIXME: ObjectID refactoring broke GDScript handling of reference pointers, this needs a proper fix.
+#endif
+			cleanup_c = (p_class != StringName("GDScript"));
 		}
 		}
 
 
 		if (c) {
 		if (c) {