diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-04-28 20:24:32 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-28 20:24:32 -0300 |
commit | 870d3c8cc7a3d12ee8e2892d83bba401c1a1f36a (patch) | |
tree | d88dcbe2c3e8369290ca2e513a0ab1f6f9900217 /core/variant_call.cpp | |
parent | c6dce44dd85c4ebae791756a76f6afbfbb0a5c28 (diff) | |
parent | 79c36ea5f72d32dc08c1144eb28dcb9e6202643d (diff) | |
download | redot-engine-870d3c8cc7a3d12ee8e2892d83bba401c1a1f36a.tar.gz |
Merge pull request #1750 from romulox-x/colorarray
fixed ColorArray constructor when taking array as parameter
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 a024c0068a..c48336d2ff 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -1032,7 +1032,7 @@ Variant Variant::construct(const Variant::Type p_type,const Variant** p_args,int case STRING_ARRAY: return (StringArray(*p_args[0])); case VECTOR2_ARRAY: return (Vector2Array(*p_args[0])); // 25 case VECTOR3_ARRAY: return (Vector3Array(*p_args[0])); // 25 - case COLOR_ARRAY: return (Color(*p_args[0])); + case COLOR_ARRAY: return (ColorArray(*p_args[0])); default: return Variant(); } } |