godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Merge pull request #53135 from briansemrau/fix-ref-leak

Browse Source
This commit is contained in:
Rémi Verschelde
2022-06-28 17:26:44 +02:00
committed by GitHub
parent 2ea7765f76 6141ce2cb8
commit 622b656c40
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/variant/variant_internal.h
View File

@@ -304,6 +304,13 @@ public:
v->_get_obj().id = ObjectID(); 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) { _FORCE_INLINE_ static void *get_opaque_pointer(Variant *v) {
switch (v->type) { switch (v->type) {
case Variant::NIL: case Variant::NIL:

2
modules/gdscript/gdscript_vm.cpp
View File

@@ -1897,7 +1897,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a
VariantInternal::initialize(ret, Variant::OBJECT); VariantInternal::initialize(ret, Variant::OBJECT);
Object **ret_opaque = VariantInternal::get_object(ret); Object **ret_opaque = VariantInternal::get_object(ret);
method->ptrcall(base_obj, argptrs, ret_opaque); 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 #ifdef DEBUG_ENABLED
if (GDScriptLanguage::get_singleton()->profiling) { if (GDScriptLanguage::get_singleton()->profiling) {