summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-02-01 11:53:23 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-02-01 11:53:23 +0100
commitd3bd1a731c0c1d06abe15e5eea5de64453008b28 (patch)
treeaefa837780ed6cc9fe744f0a81e8b9d2f6bd1b15 /core
parentffbd79518b1c40b12a46ab325b33e6ea43a338de (diff)
parent31fe57778db41bdba4a0f23615696bfaf8c37c86 (diff)
Merge pull request #3533 from Biliogadafr/FixColorArrayTscn
Parse ColorArrays correctly (tscn), fixes #3530
Diffstat (limited to 'core')
-rw-r--r--core/variant_parser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp
index 3efa87de80..4976891e2b 100644
--- a/core/variant_parser.cpp
+++ b/core/variant_parser.cpp
@@ -1282,7 +1282,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
arr.resize(len);
DVector<Color>::Write w = arr.write();
for(int i=0;i<len;i++) {
- w[i]=Color(args[i*3+0],args[i*3+1],args[i*3+2],args[i*3+3]);
+ w[i]=Color(args[i*4+0],args[i*4+1],args[i*4+2],args[i*4+3]);
}
}