diff options
author | Juan Linietsky <juan@godotengine.org> | 2020-02-13 16:03:10 -0300 |
---|---|---|
committer | Juan Linietsky <juan@godotengine.org> | 2020-02-15 08:36:04 -0300 |
commit | 867d073b98344b848c96012418912a7e72841a31 (patch) | |
tree | 3a0fa22ce848b4ee20df2057ebb5eb5d7ea8e89b /modules/gdscript/gdscript_function.h | |
parent | 53cf289f309ef44821e5bb1fe0c81de29a82d9d3 (diff) | |
download | redot-engine-867d073b98344b848c96012418912a7e72841a31.tar.gz |
Changed logic and optimized ObjectID in ObjectDB and Variant, removed RefPtr.
Diffstat (limited to 'modules/gdscript/gdscript_function.h')
-rw-r--r-- | modules/gdscript/gdscript_function.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index ad95ebc543..7b7bcbaac9 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -77,8 +77,8 @@ struct GDScriptDataType { return false; } - Object *obj = p_variant.operator Object *(); - if (!obj || !ObjectDB::instance_validate(obj)) { + Object *obj = p_variant.get_validated_object(); + if (!obj) { return false; } @@ -100,8 +100,8 @@ struct GDScriptDataType { return false; } - Object *obj = p_variant.operator Object *(); - if (!obj || !ObjectDB::instance_validate(obj)) { + Object *obj = p_variant.get_validated_object(); + if (!obj) { return false; } |