diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 19:02:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-07 19:02:48 +0300 |
| commit | b49184b608df297195c5f0e81da4d8d9ddfb9213 (patch) | |
| tree | c2624887be563319a7138516d2fcc6100acdb2c6 /source/blender/gpu | |
| parent | f62b826533422e5de3b08601e5511c233deda529 (diff) | |
| parent | f74d85ffc8232a859b1419f5dc25b244ae04375f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index bbee252cd20..9d2a0ceef4d 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -452,7 +452,7 @@ void GPU_pbvh_grid_buffers_update( diffuse_color, color_ub); } else { - F3TOCHAR3(diffuse_color, color_ub); + unit_float_to_uchar_clamp_v3(color_ub, diffuse_color); } GWN_vertbuf_attr_set(buffers->vert_buf, g_vbo_id.col, vbo_index, color_ub); } @@ -495,7 +495,7 @@ void GPU_pbvh_grid_buffers_update( color_ub); } else { - F3TOCHAR3(diffuse_color, color_ub); + unit_float_to_uchar_clamp_v3(color_ub, diffuse_color); } GWN_vertbuf_attr_set(buffers->vert_buf, g_vbo_id.col, vbo_index, color_ub); } |