diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2020-12-01 12:28:49 +0100 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2020-12-01 12:28:52 +0100 |
| commit | 86ece881e533371aafabd5eb31c641777e6ffa04 (patch) | |
| tree | 8bb2f3b39b9c32ddec141a4a1099f2be293ec25d /modules/gdscript/gdscript_vm.cpp | |
| parent | 339b64697cefce637b473cf8aee6df8bb7fe05d9 (diff) | |
| download | redot-engine-86ece881e533371aafabd5eb31c641777e6ffa04.tar.gz | |
Remove useless check in GDScript
The removed check was adding a protection for the case where a `Reference` has not yet got its reference count initialized and a script is called on it. That would cause the object to be released after the call. The removed code was constructing the `Variant` via the `Object` constructor so it didn't deal with the reference count and so the release was prevented.
However, `Variant` no longer works that way so that check was useless. Now it's just illegal to run GDScript on a Reference whose reference count has not been initialized.
Diffstat (limited to 'modules/gdscript/gdscript_vm.cpp')
| -rw-r--r-- | modules/gdscript/gdscript_vm.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/modules/gdscript/gdscript_vm.cpp b/modules/gdscript/gdscript_vm.cpp index 7942ee8d97..c33079c8ee 100644 --- a/modules/gdscript/gdscript_vm.cpp +++ b/modules/gdscript/gdscript_vm.cpp @@ -475,11 +475,7 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a } if (p_instance) { - if (p_instance->base_ref && static_cast<Reference *>(p_instance->owner)->is_referenced()) { - self = REF(static_cast<Reference *>(p_instance->owner)); - } else { - self = p_instance->owner; - } + self = p_instance->owner; script = p_instance->script.ptr(); } else { script = _script; |