diff options
| author | Juan Linietsky | 2014-04-10 00:18:27 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2014-04-10 00:18:27 -0300 |
| commit | 7ea3e8267afaf626256c84a9a3dc61e2954fc6a2 (patch) | |
| tree | 0aa7588918b814d1781fc94e8b518c7095a0bab7 /core/variant_call.cpp | |
| parent | b4969373b3475799d6b24cdffeda4659c37f0b8a (diff) | |
| download | godot-7ea3e8267afaf626256c84a9a3dc61e2954fc6a2.tar.gz godot-7ea3e8267afaf626256c84a9a3dc61e2954fc6a2.tar.zst godot-7ea3e8267afaf626256c84a9a3dc61e2954fc6a2.zip | |
Diffstat (limited to 'core/variant_call.cpp')
| -rw-r--r-- | core/variant_call.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 6ab33b7bc..63d0fcec3 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -977,7 +977,7 @@ Variant Variant::construct(const Variant::Type p_type,const Variant** p_args,int case TRANSFORM: return (Transform(p_args[0]->operator Transform())); // misc types - case COLOR: return (Color(*p_args[0])); + case COLOR: return p_args[0]->type == Variant::STRING ? Color::html(*p_args[0]) : Color::hex(*p_args[0]); case IMAGE: return (Image(*p_args[0])); case NODE_PATH: return (NodePath(p_args[0]->operator NodePath())); // 15 case _RID: return (RID(*p_args[0])); |