Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-26 03:04:31 +00:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: C3336907360768E1
31 changed files with 98 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/visual_script/visual_script_editor.cpp
View file

@ -388,7 +388,7 @@ static Color _color_from_type(Variant::Type p_type, bool dark_theme = true) {
case Variant::NODE_PATH:
color = Color(0.41, 0.58, 0.93);
break;
case Variant::_RID:
case Variant::RID:
color = Color(0.41, 0.93, 0.6);
break;
case Variant::OBJECT:
@ -494,7 +494,7 @@ static Color _color_from_type(Variant::Type p_type, bool dark_theme = true) {
case Variant::NODE_PATH:
color = Color(0.41, 0.58, 0.93);
break;
case Variant::_RID:
case Variant::RID:
color = Color(0.17, 0.9, 0.45);
break;
case Variant::OBJECT: