diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-09 14:53:05 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-09 16:29:04 +0100 |
commit | 9d2e8f2f27ec467e9004e0d94f8106b3bb1d0afd (patch) | |
tree | 26bd086695171bf2b932e7e82175ecba722df7db /core/variant/variant_setget.cpp | |
parent | bd0c40d05197aee3b7257d1954a7061a4a272e6b (diff) | |
download | redot-engine-9d2e8f2f27ec467e9004e0d94f8106b3bb1d0afd.tar.gz |
Variant: Rename Type::_RID to Type::RID
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`.
Diffstat (limited to 'core/variant/variant_setget.cpp')
-rw-r--r-- | core/variant/variant_setget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/variant/variant_setget.cpp b/core/variant/variant_setget.cpp index cae64376d5..05fe2b80d9 100644 --- a/core/variant/variant_setget.cpp +++ b/core/variant/variant_setget.cpp @@ -2385,7 +2385,7 @@ void Variant::interpolate(const Variant &a, const Variant &b, float c, Variant & r_dst = a; } return; - case _RID: { + case RID: { r_dst = a; } return; |