[Bf-blender-cvs] [06b99bf] compositor-2016: Fix wrong scale of vertex color values when doing border render of Cycles viewport

[Sergey Sharybin]

Commit: 06b99bf5f335ccdb95fd30a764ff483ce25c3cc7
Author: Sergey Sharybin
Date:   Mon May 23 14:40:04 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB06b99bf5f335ccdb95fd30a764ff483ce25c3cc7

Fix wrong scale of vertex color values when doing border render of Cycles 
viewport

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

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

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c 
b/source/blender/blenkernel/intern/DerivedMesh.c
index 9c500fa..423b8fa 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3791,17 +3791,17 @@ void DM_draw_attrib_vertex(DMVertexAttribs *attribs, 
int a, int index, int vert,
 
        /* vertex colors */
        for (b = 0; b < attribs->totmcol; b++) {
-               GLubyte col[4];
+               GLfloat col[4];
 
                if (attribs->mcol[b].array) {
                        const MLoopCol *cp = &attribs->mcol[b].array[loop];
-                       copy_v4_v4_uchar(col, &cp->r);
+                       rgba_uchar_to_float(col, &cp->r);
                }
                else {
-                       col[0] = 0; col[1] = 0; col[2] = 0; col[3] = 0;
+                       zero_v4(col);
                }
 
-               glVertexAttrib4ubv(attribs->mcol[b].gl_index, col);
+               glVertexAttrib4fv(attribs->mcol[b].gl_index, col);
        }
 
        /* tangent for normal mapping */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs