diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-23 15:40:04 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-23 15:40:04 +0300 |
| commit | 12f86a4e48c1cb448d4a07201118a7fb1cc8ce7d (patch) | |
| tree | e35826f6285264e55c3801bd1637c03d044d98df /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 6d84a4ecfd4914048bc815c7d1bfedec28d4bc22 (diff) | |
Fix wrong scale of vertex color values when doing border render of Cycles viewport
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 9c500fad2ca..423b8fade39 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 */ |