blender
/
blender
137
411
Fork 593
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

Let's try that again.

This commit is contained in:
Joseph Eagar 2021-05-23 21:39:37 -07:00
parent 33066542ca
commit 995702da48
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/sculpt_paint/sculpt_expand.c
View File

@ -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);
}
}

9
source/blender/editors/sculpt_paint/sculpt_geodesic.c
View File

@ -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);
}
}
}