[Bf-blender-cvs] [995702da485] temp_bmesh_multires: Let's try that again.

[Joseph Eagar]

Commit: 995702da4855dab4f8cd29291be7bc1c3c3ffaf0
Author: Joseph Eagar
Date:   Sun May 23 21:39:37 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB995702da4855dab4f8cd29291be7bc1c3c3ffaf0

Let's try that again.

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

M	source/blender/editors/sculpt_paint/sculpt_expand.c
M	source/blender/editors/sculpt_paint/sculpt_geodesic.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.c b/source/blender/editors/sculpt_paint/sculpt_expand.c
index 2c17ae917ea..39d251ca44d 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@ -2061,8 +2061,8 @@ static void sculpt_expand_delete_face_set_id_bmesh(int *r_face_sets,
     return;
   }
 
-  BLI_LINKSTACK_DECLARE(queue, void *);
-  BLI_LINKSTACK_DECLARE(queue_next, void *);
+  BLI_LINKSTACK_DECLARE(queue, BMFace *);
+  BLI_LINKSTACK_DECLARE(queue_next, BMFace *);
 
   BLI_LINKSTACK_INIT(queue);
   BLI_LINKSTACK_INIT(queue_next);
@@ -2110,7 +2110,7 @@ static void sculpt_expand_delete_face_set_id_bmesh(int *r_face_sets,
         r_face_sets[f_index] = other_id;
       }
       else {
-        BLI_LINKSTACK_PUSH(queue_next, (void *)bf);
+        BLI_LINKSTACK_PUSH(queue_next, bf);
       }
     }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.c b/source/blender/editors/sculpt_paint/sculpt_geodesic.c
index e64dbfc4e38..9f5a1435c96 100644
--- a/source/blender/editors/sculpt_paint/sculpt_geodesic.c
+++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.c
@@ -529,9 +529,8 @@ static float *SCULPT_geodesic_bmesh_create(Object *ob,
   float *dists = MEM_malloc_arrayN(totvert, sizeof(float), "distances");
   BLI_bitmap *edge_tag = BLI_BITMAP_NEW(totedge, "edge tag");
 
-  /* Both contain edge indices encoded as *void. */
-  BLI_LINKSTACK_DECLARE(queue, void *);
-  BLI_LINKSTACK_DECLARE(queue_next, void *);
+  BLI_LINKSTACK_DECLARE(queue, BMEdge *);
+  BLI_LINKSTACK_DECLARE(queue_next, BMEdge *);
 
   BLI_LINKSTACK_INIT(queue);
   BLI_LINKSTACK_INIT(queue_next);
@@ -596,7 +595,7 @@ static float *SCULPT_geodesic_bmesh_create(Object *ob,
       continue;
     }
     if (dists[v1_i] != FLT_MAX || dists[v2_i] != FLT_MAX) {
-      BLI_LINKSTACK_PUSH(queue, (void *)e);
+      BLI_LINKSTACK_PUSH(queue, e);
     }
 
     i++;
@@ -664,7 +663,7 @@ static float *SCULPT_geodesic_bmesh_create(Object *ob,
 
                 if (ok) {
                   BLI_BITMAP_ENABLE(edge_tag, e_other_i);
-                  BLI_LINKSTACK_PUSH(queue_next, (void *)e_other);
+                  BLI_LINKSTACK_PUSH(queue_next, e_other);
                 }
               }
             }