diff options
Diffstat (limited to 'source/blender/gpu/intern/gpu_buffers.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 44 |
1 files changed, 32 insertions, 12 deletions
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 7875cad289a..28e117a0ff9 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -1354,6 +1354,7 @@ struct GPU_PBVH_Buffers { int smooth; bool show_diffuse_color; + bool use_matcaps; float diffuse_color[4]; }; typedef enum { @@ -1443,12 +1444,15 @@ void GPU_update_mesh_pbvh_buffers(GPU_PBVH_Buffers *buffers, MVert *mvert, buffers->vmask = vmask; buffers->show_diffuse_color = show_diffuse_color; + buffers->use_matcaps = GPU_material_use_matcaps_get(); if (buffers->vert_buf) { int totelem = (buffers->smooth ? totvert : (buffers->tot_tri * 3)); - float diffuse_color[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + float diffuse_color[4] = {0.8f, 0.8f, 0.8f, 0.8f}; - if (buffers->show_diffuse_color) { + if (buffers->use_matcaps) + diffuse_color[0] = diffuse_color[1] = diffuse_color[2] = 1.0; + else if (show_diffuse_color) { MFace *f = buffers->mface + buffers->face_indices[0]; GPU_material_diffuse_get(f->mat_nr + 1, diffuse_color); @@ -1583,6 +1587,7 @@ GPU_PBVH_Buffers *GPU_build_pbvh_mesh_buffers(int (*face_vert_indices)[4], buffers->smooth = mface[face_indices[0]].flag & ME_SMOOTH; buffers->show_diffuse_color = false; + buffers->use_matcaps = false; /* Count the number of visible triangles */ for (i = 0, tottri = 0; i < totface; ++i) { @@ -1658,15 +1663,18 @@ void GPU_update_grid_pbvh_buffers(GPU_PBVH_Buffers *buffers, CCGElem **grids, int i, j, k, x, y; buffers->show_diffuse_color = show_diffuse_color; + buffers->use_matcaps = GPU_material_use_matcaps_get(); /* Build VBO */ if (buffers->vert_buf) { int totvert = key->grid_area * totgrid; int smooth = grid_flag_mats[grid_indices[0]].flag & ME_SMOOTH; const int has_mask = key->has_mask; - float diffuse_color[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + float diffuse_color[4] = {0.8f, 0.8f, 0.8f, 1.0f}; - if (buffers->show_diffuse_color) { + if (buffers->use_matcaps) + diffuse_color[0] = diffuse_color[1] = diffuse_color[2] = 1.0; + else if (show_diffuse_color) { const DMFlagMat *flags = &grid_flag_mats[grid_indices[0]]; GPU_material_diffuse_get(flags->mat_nr + 1, diffuse_color); @@ -1903,6 +1911,7 @@ GPU_PBVH_Buffers *GPU_build_grid_pbvh_buffers(int *grid_indices, int totgrid, buffers->totgrid = totgrid; buffers->show_diffuse_color = false; + buffers->use_matcaps = false; /* Count the number of quads */ totquad = gpu_count_grid_quads(grid_hidden, grid_indices, totgrid, gridsize); @@ -2023,17 +2032,18 @@ void GPU_update_bmesh_pbvh_buffers(GPU_PBVH_Buffers *buffers, GHash *bm_faces, GSet *bm_unique_verts, GSet *bm_other_verts, - int show_diffuse_color) + bool show_diffuse_color) { VertexBufferFormat *vert_data; void *tri_data; int tottri, totvert, maxvert = 0; - float diffuse_color[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + float diffuse_color[4] = {0.8f, 0.8f, 0.8f, 1.0f}; /* TODO, make mask layer optional for bmesh buffer */ const int cd_vert_mask_offset = CustomData_get_offset(&bm->vdata, CD_PAINT_MASK); buffers->show_diffuse_color = show_diffuse_color; + buffers->use_matcaps = GPU_material_use_matcaps_get(); if (!buffers->vert_buf || (buffers->smooth && !buffers->index_buf)) return; @@ -2061,8 +2071,10 @@ void GPU_update_bmesh_pbvh_buffers(GPU_PBVH_Buffers *buffers, return; } - if (show_diffuse_color) { - /* due to dynamc nature of dyntopo, only get first material */ + if (buffers->use_matcaps) + diffuse_color[0] = diffuse_color[1] = diffuse_color[2] = 1.0; + else if (show_diffuse_color) { + /* due to dynamic nature of dyntopo, only get first material */ GHashIterator gh_iter; BMFace *f; BLI_ghashIterator_init(&gh_iter, bm_faces); @@ -2215,6 +2227,7 @@ GPU_PBVH_Buffers *GPU_build_bmesh_pbvh_buffers(int smooth_shading) buffers->use_bmesh = true; buffers->smooth = smooth_shading; buffers->show_diffuse_color = false; + buffers->use_matcaps = false; return buffers; } @@ -2225,9 +2238,11 @@ static void gpu_draw_buffers_legacy_mesh(GPU_PBVH_Buffers *buffers) int i, j; const int has_mask = (buffers->vmask != NULL); const MFace *face = &buffers->mface[buffers->face_indices[0]]; - float diffuse_color[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + float diffuse_color[4] = {0.8f, 0.8f, 0.8f, 1.0f}; - if (buffers->show_diffuse_color) + if (buffers->use_matcaps) + diffuse_color[0] = diffuse_color[1] = diffuse_color[2] = 1.0; + else if (buffers->show_diffuse_color) GPU_material_diffuse_get(face->mat_nr + 1, diffuse_color); if (has_mask) { @@ -2297,9 +2312,11 @@ static void gpu_draw_buffers_legacy_grids(GPU_PBVH_Buffers *buffers) int i, j, x, y, gridsize = buffers->gridkey.grid_size; const int has_mask = key->has_mask; const DMFlagMat *flags = &buffers->grid_flag_mats[buffers->grid_indices[0]]; - float diffuse_color[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + float diffuse_color[4] = {0.8f, 0.8f, 0.8f, 1.0f}; - if (buffers->show_diffuse_color) + if (buffers->use_matcaps) + diffuse_color[0] = diffuse_color[1] = diffuse_color[2] = 1.0; + else if (buffers->show_diffuse_color) GPU_material_diffuse_get(flags->mat_nr + 1, diffuse_color); if (has_mask) { @@ -2517,6 +2534,9 @@ bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers *buffers, GHash *bm_faces if (buffers->show_diffuse_color != show_diffuse_color) return true; + if (buffers->use_matcaps != GPU_material_use_matcaps_get()) + return true; + if (buffers->show_diffuse_color == false) return false; |