[Bf-blender-cvs] [9667f89e82c] blender-v2.83-release: Cleanup: correct printf warnings for bmesh interesect debugging

Campbell Barton noreply at git.blender.org
Fri Apr 24 04:21:34 CEST 2020


Commit: 9667f89e82cd969b008d8b5d1673bfbd689b22fa
Author: Campbell Barton
Date:   Fri Apr 24 11:47:41 2020 +1000
Branches: blender-v2.83-release
https://developer.blender.org/rB9667f89e82cd969b008d8b5d1673bfbd689b22fa

Cleanup: correct printf warnings for bmesh interesect debugging

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

M	source/blender/bmesh/tools/bmesh_intersect.c

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

diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c
index 4ca8364c312..ecd39ca714e 100644
--- a/source/blender/bmesh/tools/bmesh_intersect.c
+++ b/source/blender/bmesh/tools/bmesh_intersect.c
@@ -564,11 +564,11 @@ static void bm_isect_tri_tri(
       for (i_b = 0; i_b < 3; i_b++) {
         if (len_squared_v3v3(fv_a[i_a]->co, fv_b[i_b]->co) <= s->epsilon.eps2x_sq) {
 #ifdef USE_DUMP
-          if (BM_ELEM_API_FLAG_TEST(fv_a[i_a], VERT_VISIT) == 0) {
-            printf("  ('VERT-VERT-A') %d, %d),\n", i_a, BM_elem_index_get(fv_a[i_a]));
+          if (BM_ELEM_API_FLAG_TEST(fv_a[i_a], VERT_VISIT_A) == 0) {
+            printf("  ('VERT-VERT-A') %u, %d),\n", i_a, BM_elem_index_get(fv_a[i_a]));
           }
-          if (BM_ELEM_API_FLAG_TEST(fv_b[i_b], VERT_VISIT) == 0) {
-            printf("  ('VERT-VERT-B') %d, %d),\n", i_b, BM_elem_index_get(fv_b[i_b]));
+          if (BM_ELEM_API_FLAG_TEST(fv_b[i_b], VERT_VISIT_B) == 0) {
+            printf("  ('VERT-VERT-B') %u, %d),\n", i_b, BM_elem_index_get(fv_b[i_b]));
           }
 #endif
           STACK_PUSH_TEST_A(fv_a[i_a]);
@@ -905,7 +905,7 @@ static int isect_bvhtree_point_v3(BVHTree *tree, const float **looptris, const f
   BLI_bvhtree_ray_cast(tree, co, dir, 0.0f, &hit, raycast_callback, &raycast_data);
 
 #  ifdef USE_DUMP
-  printf("%s: Total intersections: %d\n", __func__, z_buffer.count);
+  printf("%s: Total intersections: %zu\n", __func__, z_buffer.count);
 #  endif
 
   int num_isect;
@@ -1179,7 +1179,7 @@ bool BM_mesh_intersect(BMesh *bm,
       }
 
 #  ifdef USE_DUMP
-      printf("# SPLITTING EDGE: %d, %d\n", BM_elem_index_get(e), v_ls_base->list_len);
+      printf("# SPLITTING EDGE: %d, %u\n", BM_elem_index_get(e), v_ls_base->list_len);
 #  endif
       /* intersect */
       is_wire = BLI_gset_haskey(s.wire_edges, e);



More information about the Bf-blender-cvs mailing list