Bladeren bron

GDScript Don't double-reference Refs returned from native function

Brian Semrau 4 jaren geleden
bovenliggende
commit
6141ce2cb8
2 gewijzigde bestanden met toevoegingen van 8 en 1 verwijderingen
  1. 7 0
      core/variant/variant_internal.h
  2. 1 1
      modules/gdscript/gdscript_vm.cpp

+ 7 - 0
core/variant/variant_internal.h

@@ -300,6 +300,13 @@ public:
 		v->_get_obj().id = ObjectID();
 	}
 
+	static void update_object_id(Variant *v) {
+		const Object *o = v->_get_obj().obj;
+		if (o) {
+			v->_get_obj().id = o->get_instance_id();
+		}
+	}
+
 	_FORCE_INLINE_ static void *get_opaque_pointer(Variant *v) {
 		switch (v->type) {
 			case Variant::NIL:

+ 1 - 1
modules/gdscript/gdscript_vm.cpp

@@ -1814,7 +1814,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
 				VariantInternal::initialize(ret, Variant::OBJECT);
 				Object **ret_opaque = VariantInternal::get_object(ret);
 				method->ptrcall(base_obj, argptrs, ret_opaque);
-				VariantInternal::object_assign(ret, *ret_opaque); // Set so ID is correct too.
+				VariantInternal::update_object_id(ret);
 
 #ifdef DEBUG_ENABLED
 				if (GDScriptLanguage::get_singleton()->profiling) {