[Bf-blender-cvs] [5a26ea09619] temp_bmesh_multires: DynTopo: Attempt to fix compiling on macos
Joseph Eagar
noreply at git.blender.org
Mon May 24 06:02:46 CEST 2021
Commit: 5a26ea09619fb7ccc2d760336af803b6a48db918
Author: Joseph Eagar
Date: Sun May 23 21:02:29 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB5a26ea09619fb7ccc2d760336af803b6a48db918
DynTopo: Attempt to fix compiling on macos
===================================================================
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 a89a247a071..2c17ae917ea 100644
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@ -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, bf);
+ BLI_LINKSTACK_PUSH(queue_next, (void *)bf);
}
}
diff --git a/source/blender/editors/sculpt_paint/sculpt_geodesic.c b/source/blender/editors/sculpt_paint/sculpt_geodesic.c
index db9fd368584..e64dbfc4e38 100644
--- a/source/blender/editors/sculpt_paint/sculpt_geodesic.c
+++ b/source/blender/editors/sculpt_paint/sculpt_geodesic.c
@@ -596,7 +596,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, e);
+ BLI_LINKSTACK_PUSH(queue, (void *)e);
}
i++;
@@ -664,7 +664,7 @@ static float *SCULPT_geodesic_bmesh_create(Object *ob,
if (ok) {
BLI_BITMAP_ENABLE(edge_tag, e_other_i);
- BLI_LINKSTACK_PUSH(queue_next, e_other);
+ BLI_LINKSTACK_PUSH(queue_next, (void *)e_other);
}
}
}
More information about the Bf-blender-cvs
mailing list