[Bf-blender-cvs] [43eabfe] temp_display_optimization: Fix error with vertex color upload for subsurf

[Antony Riakiotakis]

Commit: 43eabfe5b89418cafa0458fcd01f25b21c70b432
Author: Antony Riakiotakis
Date:   Thu Jun 25 15:06:23 2015 +0200
Branches: temp_display_optimization
https://developer.blender.org/rB43eabfe5b89418cafa0458fcd01f25b21c70b432

Fix error with vertex color upload for subsurf

===================================================================

M	source/blender/blenkernel/intern/subsurf_ccg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index fbf9143..7038b64 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1980,7 +1980,7 @@ static void ccgDM_prepare_color_data(DerivedMesh *dm, float *varray_, int *UNUSE
 			for (y = 0; y < gridFaces; y++) {
 				for (x = 0; x < gridFaces; x++) {
 					copy_mcol_uc3(&varray[start], &mcol[iface * 16]);
-					copy_mcol_uc3(&varray[start + 3], &mcol[iface * 16 + 16]);
+					copy_mcol_uc3(&varray[start + 3], &mcol[iface * 16 + 12]);
 					copy_mcol_uc3(&varray[start + 6], &mcol[iface * 16 + 8]);
 					copy_mcol_uc3(&varray[start + 9], &mcol[iface * 16 + 4]);