diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-04-02 19:56:19 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-04-02 19:56:19 +0400 |
| commit | 8c730b1059032f45da06c278715909b71009909c (patch) | |
| tree | 88078ebd72fec6bd47d310dc41f9a38f26db6fdc /source/blender/blenkernel/intern/pbvh.c | |
| parent | 6785e45951288bca8176893dba46e73c10ad2673 (diff) | |
Fix T39520, show diffuse not working in dyntopo.
Was marked as a todo in the code.
This does not yet take care of correct display for multi material
meshes, since it would need correct separation of faces during pbvh
creation. Instead we just take material of first face in node and assume
that the rest faces have the same. This will create some funky effects
if one attempts to sculpt in this way.
Note: This does not yet address T39517
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 119f7b0f939..40974d7d4f8 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1085,7 +1085,8 @@ static void pbvh_update_draw_buffers(PBVH *bvh, PBVHNode **nodes, int totnode) bvh->bm, node->bm_faces, node->bm_unique_verts, - node->bm_other_verts); + node->bm_other_verts, + bvh->show_diffuse_color); break; } @@ -1673,7 +1674,7 @@ static void pbvh_node_check_diffuse_changed(PBVH *bvh, PBVHNode *node) if (!node->draw_buffers) return; - if (GPU_pbvh_buffers_diffuse_changed(node->draw_buffers, bvh->show_diffuse_color)) + if (GPU_pbvh_buffers_diffuse_changed(node->draw_buffers, node->bm_faces, bvh->show_diffuse_color)) node->flag |= PBVH_UpdateDrawBuffers; } |