Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for "Show Diffuse Color" was having affect on mesh without mask

Browse Source 
Only happened with VBOs enabled.
This commit is contained in:
Sergey Sharybin
2014-04-01 14:00:15 +06:00
parent 9904127e33
commit 7955cb78d6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1442,7 +1442,7 @@ void GPU_update_mesh_pbvh_buffers(GPU_PBVH_Buffers *buffers, MVert *mvert,
int i, j, k; int i, j, k;
buffers->vmask = vmask; buffers->vmask = vmask;
buffers->show_diffuse_color = show_diffuse_color; buffers->show_diffuse_color = (vmask == NULL) || show_diffuse_color;
if (buffers->vert_buf) { if (buffers->vert_buf) {
int totelem = (buffers->smooth ? totvert : (buffers->tot_tri * 3)); int totelem = (buffers->smooth ? totvert : (buffers->tot_tri * 3));
@@ -1657,7 +1657,7 @@ void GPU_update_grid_pbvh_buffers(GPU_PBVH_Buffers *buffers, CCGElem **grids,
VertexBufferFormat *vert_data; VertexBufferFormat *vert_data;
int i, j, k, x, y; int i, j, k, x, y;
buffers->show_diffuse_color = show_diffuse_color; buffers->show_diffuse_color = (key->has_mask == false) || show_diffuse_color;
/* Build VBO */ /* Build VBO */
if (buffers->vert_buf) { if (buffers->vert_buf) {
@@ -1892,7 +1892,7 @@ static GLuint gpu_get_grid_buffer(int gridsize, GLenum *index_type, unsigned *to
} }
GPU_PBVH_Buffers *GPU_build_grid_pbvh_buffers(int *grid_indices, int totgrid, GPU_PBVH_Buffers *GPU_build_grid_pbvh_buffers(int *grid_indices, int totgrid,
BLI_bitmap **grid_hidden, int gridsize) BLI_bitmap **grid_hidden, int gridsize)
{ {
GPU_PBVH_Buffers *buffers; GPU_PBVH_Buffers *buffers;
int totquad; int totquad;