godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36359 from vnen/variant-reference-fix 

Fix Ref(Variant) constructor to properly check the object type
This commit is contained in:
Rémi Verschelde 2020-02-19 16:51:32 +01:00 committed by GitHub
parent 05e610b78c cb0b5eae8c
commit 4581a9373c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/reference.h
View File

@ -170,9 +170,9 @@ public:
return; return;
} }
Reference *r = Object::cast_to<Reference>(object); T *r = Object::cast_to<T>(object);
if (r && r->reference()) { if (r && r->reference()) {
reference = static_cast<T *>(r); reference = r;
} }
} }
@ -226,9 +226,9 @@ public:
return; return;
} }
Reference *r = Object::cast_to<Reference>(object); T *r = Object::cast_to<T>(object);
if (r && r->reference()) { if (r && r->reference()) {
reference = static_cast<T *>(r); reference = r;
} else { } else {
reference = nullptr; reference = nullptr;
} }