diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 23:03:46 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-02 23:03:46 -0300 |
commit | 118eed485e8f928a5a0dab530ae93211afa10525 (patch) | |
tree | 83efb5cbcebb7046e5b64dfe1712475a7d3b7f14 /core/variant.cpp | |
parent | ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (diff) | |
download | redot-engine-118eed485e8f928a5a0dab530ae93211afa10525.tar.gz |
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant.
All usages of "type" to refer to classes were renamed to "class"
ClassDB has been exposed to GDScript.
OBJ_TYPE() macro is now GDCLASS()
Diffstat (limited to 'core/variant.cpp')
-rw-r--r-- | core/variant.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant.cpp b/core/variant.cpp index 437f1fb634..19b0ea7129 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -1665,7 +1665,7 @@ Variant::operator String() const { }; }; #endif - return "["+_get_obj().obj->get_type()+":"+itos(_get_obj().obj->get_instance_ID())+"]"; + return "["+_get_obj().obj->get_class()+":"+itos(_get_obj().obj->get_instance_ID())+"]"; } else return "[Object:null]"; @@ -3066,7 +3066,7 @@ String Variant::get_call_error_text(Object* p_base, const StringName& p_method,c return "Call OK"; } - String class_name = p_base->get_type(); + String class_name = p_base->get_class(); Ref<Script> script = p_base->get_script(); if (script.is_valid() && script->get_path().is_resource_file()) { |