diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-09 17:46:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 17:46:34 +0100 |
| commit | 827e5b8bf3ba84719fd98b9a50f6d744de3561e0 (patch) | |
| tree | 6089285a595c7f10317a0701206edfb9a7aff83b /core/variant/variant_construct.cpp | |
| parent | fdf84d25f3070f7cb8b6fb771f4a71ae4fb25f8e (diff) | |
| parent | 9d2e8f2f27ec467e9004e0d94f8106b3bb1d0afd (diff) | |
Merge pull request #43412 from akien-mga/variant-rename-_RID-to-RID
Variant: Rename Type::_RID to Type::RID
Diffstat (limited to 'core/variant/variant_construct.cpp')
| -rw-r--r-- | core/variant/variant_construct.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/variant/variant_construct.cpp b/core/variant/variant_construct.cpp index b847ba09b9..e263d98815 100644 --- a/core/variant/variant_construct.cpp +++ b/core/variant/variant_construct.cpp @@ -577,7 +577,7 @@ void Variant::_register_variant_constructors() { add_constructor<VariantConstructor<NodePath, NodePath>>(sarray("from")); add_constructor<VariantConstructor<NodePath, String>>(sarray("from")); - add_constructor<VariantConstructor<RID, RID>>(sarray("from")); + add_constructor<VariantConstructor<::RID, ::RID>>(sarray("from")); add_constructor<VariantConstructorObject>(sarray("from")); add_constructor<VariantConstructorNilObject>(sarray("from")); @@ -654,7 +654,7 @@ void Variant::_register_variant_constructors() { initialize_funcs[COLOR] = variant_initialize<Color>; initialize_funcs[STRING_NAME] = variant_initialize<StringName>; initialize_funcs[NODE_PATH] = variant_initialize<NodePath>; - initialize_funcs[_RID] = variant_initialize<RID>; + initialize_funcs[RID] = variant_initialize<::RID>; initialize_funcs[OBJECT] = variant_initialize_obj; initialize_funcs[CALLABLE] = variant_initialize<Callable>; initialize_funcs[SIGNAL] = variant_initialize<Signal>; |