godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Variant: Rename Type::_RID to Type::RID

Browse Source 
The underscore prefix was used to avoid the conflict between the `RID` class
name and the matching enum value in `Variant::Type`.

This can be fixed differently by prefixing uses of the `RID` class in `Variant`
with the scope resolution operator, as done already for `AABB`.
This commit is contained in:
Rémi Verschelde
2020-11-09 14:53:05 +01:00
parent bd0c40d051
commit 9d2e8f2f27
31 changed files with 98 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gdscript_parser.cpp
View File

@@ -65,7 +65,7 @@ Variant::Type GDScriptParser::get_builtin_type(const StringName &p_type) {
builtin_types["Basis"] = Variant::BASIS;
builtin_types["Transform"] = Variant::TRANSFORM;
builtin_types["Color"] = Variant::COLOR;
builtin_types["RID"] = Variant::_RID;
builtin_types["RID"] = Variant::RID;
builtin_types["Object"] = Variant::OBJECT;
builtin_types["StringName"] = Variant::STRING_NAME;
builtin_types["NodePath"] = Variant::NODE_PATH;