archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-05-07 18:02:48 +02:00
parent f62b826533 f74d85ffc8
commit b49184b608
29 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/intern/gpu_buffers.c
View File

@@ -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);
}