diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-28 22:06:06 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-28 22:06:06 -0300 |
| commit | 16a73bccd28d313f5eb6d1ca5c4c01aab91633b5 (patch) | |
| tree | 444b72b704342d7ffd01e90343c669bd82420840 /core | |
| parent | 98c086edafbbb81635fed46b17268af2df9ae47d (diff) | |
| parent | 870d3c8cc7a3d12ee8e2892d83bba401c1a1f36a (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core')
| -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(); } } |