Merge pull request #36481 from nekomatata/fix-crash-connect-callable

Fixed crash when connecting a signal in GDScript
2020-02-25 13:26:08 +01:00
parent 376a8255a9 a5505ce643
commit fe1dfb5fb7
2 changed files with 12 additions and 4 deletions
--- 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();
 	}