diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-25 13:26:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 13:26:08 +0100 |
| commit | fe1dfb5fb74f271d1319cd73e34f8bbdc69de20a (patch) | |
| tree | de928855131994e41d91a6ad56365e6be5a31a93 /core/variant.cpp | |
| parent | 376a8255a9b65b016fcd81634bfd54fb7fa029df (diff) | |
| parent | a5505ce64341029dad9ac45f5a4cbc5648ab1a52 (diff) | |
| download | redot-engine-fe1dfb5fb74f271d1319cd73e34f8bbdc69de20a.tar.gz | |
Merge pull request #36481 from nekomatata/fix-crash-connect-callable
Fixed crash when connecting a signal in GDScript
Diffstat (limited to 'core/variant.cpp')
| -rw-r--r-- | core/variant.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 877e188809..1e09df98c7 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1549,6 +1549,8 @@ Variant::operator uint64_t() const { Variant::operator ObjectID() const { if (type == INT) { return ObjectID(_data._int); + } else if (type == OBJECT) { + return _get_obj().id; } else { return ObjectID(); } |