[Bf-blender-cvs] [7cdaf56] master: Dyntopo: use hidden face flags in more places

Campbell Barton noreply at git.blender.org
Thu Apr 10 23:51:51 CEST 2014


Commit: 7cdaf56b30381881d174e70bbb6f808470e7b74a
Author: Campbell Barton
Date:   Fri Apr 11 07:51:14 2014 +1000
https://developer.blender.org/rB7cdaf56b30381881d174e70bbb6f808470e7b74a

Dyntopo: use hidden face flags in more places

===================================================================

M	source/blender/blenkernel/intern/pbvh_bmesh.c
M	source/blender/gpu/intern/gpu_buffers.c

===================================================================

diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index ba38327..24969c1 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 e1db9b6..07d6345 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;




More information about the Bf-blender-cvs mailing list