[Bf-blender-cvs] [f9adf36] master: Fix vertex colors being displayed wrong in GLSL in edit mode. Looks like swapping the colors is no longer needed.

[Antony Riakiotakis]

Commit: f9adf3616cf3283e2e449fea5c0848b141194802
Author: Antony Riakiotakis
Date:   Fri Nov 14 12:15:36 2014 +0100
Branches: master
https://developer.blender.org/rBf9adf3616cf3283e2e449fea5c0848b141194802

Fix vertex colors being displayed wrong in GLSL in edit mode. Looks like
swapping the colors is no longer needed.

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

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

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

diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index ce7804d..7d64892 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -970,7 +970,7 @@ static void emdm_pass_attrib_vertex_glsl(const DMVertexAttribs *attribs, const B
 		GLubyte col[4];
 		if (attribs->mcol[i].em_offset != -1) {
 			const MLoopCol *cp = BM_ELEM_CD_GET_VOID_P(loop, attribs->mcol[i].em_offset);
-			col[0] = cp->b; col[1] = cp->g; col[2] = cp->r; col[3] = cp->a;
+			copy_v4_v4_char((char *)col, &cp->r);
 		}
 		else {
 			col[0] = 0; col[1] = 0; col[2] = 0; col[3] = 0;