diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-11 01:51:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-11 01:51:14 +0400 |
commit | 7cdaf56b30381881d174e70bbb6f808470e7b74a (patch) | |
tree | d22503782c7cfdaee65260caa0fb987344227dbb | |
parent | 6292b60a3f5b1c224ec78301c7830045560fa3b4 (diff) |
Dyntopo: use hidden face flags in more places
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 6 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index ba383279900..24969c1a07a 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1046,7 +1046,7 @@ bool pbvh_bmesh_node_raycast(PBVHNode *node, const float ray_start[3], BMFace *f = BLI_gsetIterator_getKey(&gs_iter); BLI_assert(f->len == 3); - if (f->len == 3 && !paint_is_bmesh_face_hidden(f)) { + if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { BMVert *v_tri[3]; BM_face_as_array_vert_tri(f, v_tri); @@ -1078,7 +1078,7 @@ bool BKE_pbvh_bmesh_node_raycast_detail( BMFace *f = BLI_gsetIterator_getKey(&gs_iter); BLI_assert(f->len == 3); - if (f->len == 3 && !paint_is_bmesh_face_hidden(f)) { + if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { BMVert *v_tri[3]; bool hit_local; BM_face_as_array_vert_tri(f, v_tri); @@ -1282,7 +1282,7 @@ void BKE_pbvh_bmesh_node_save_orig(PBVHNode *node) GSET_ITER (gs_iter, node->bm_faces) { BMFace *f = BLI_gsetIterator_getKey(&gs_iter); - if (paint_is_bmesh_face_hidden(f)) + if (BM_elem_flag_test(f, BM_ELEM_HIDDEN)) continue; #if 0 diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index e1db9b6f83a..07d634522e2 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -2162,7 +2162,7 @@ void GPU_update_bmesh_pbvh_buffers(GPU_PBVH_Buffers *buffers, BLI_assert(f->len == 3); - if (!paint_is_bmesh_face_hidden(f)) { + if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { BMVert *v[3]; float fmask = 0; int i; @@ -2218,7 +2218,7 @@ void GPU_update_bmesh_pbvh_buffers(GPU_PBVH_Buffers *buffers, GSET_ITER (gs_iter, bm_faces) { BMFace *f = BLI_gsetIterator_getKey(&gs_iter); - if (!paint_is_bmesh_face_hidden(f)) { + if (!BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { BMLoop *l_iter; BMLoop *l_first; |