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

Make Variant aware that an Object may be a Reference

Browse Source
This commit is contained in:
Pedro J. Estébanez
2020-10-24 13:50:58 +02:00
parent 798ee982ac
commit 1e9a774ac2
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/variant.cpp
View File

@ -2338,12 +2338,20 @@ Variant::Variant(const RID &p_rid) {
Variant::Variant(const Object *p_object) {
type = OBJECT;
Object *obj = const_cast<Object *>(p_object);
memnew_placement(_data._mem, ObjData);
Reference *ref = Object::cast_to<Reference>(obj);
if (unlikely(ref)) {
*reinterpret_cast<Ref<Reference> *>(_get_obj().ref.get_data()) = Ref<Reference>(ref);
#ifdef DEBUG_ENABLED
_get_obj().rc = p_object ? const_cast<Object *>(p_object)->_use_rc() : NULL;
#else
_get_obj().obj = const_cast<Object *>(p_object);
_get_obj().rc = NULL;
} else {
_get_obj().rc = likely(obj) ? obj->_use_rc() : NULL;
#endif
}
#if !defined(DEBUG_ENABLED)
_get_obj().obj = obj;
#endif
}