Fixes from merge
This commit is contained in:
parent
49bd2228cb
commit
681e2b6134
|
@ -139,8 +139,6 @@ static void do_draw_face_sets_brush_task_cb_ex(void *__restrict userdata,
|
|||
|
||||
MVert *mvert = SCULPT_mesh_deformed_mverts_get(ss);
|
||||
|
||||
MVert *mvert = SCULPT_mesh_deformed_mverts_get(ss);
|
||||
|
||||
BKE_pbvh_vertex_iter_begin(ss->pbvh, data->nodes[n], vd, PBVH_ITER_UNIQUE)
|
||||
{
|
||||
if (BKE_pbvh_type(ss->pbvh) == PBVH_FACES) {
|
||||
|
|
|
@ -448,12 +448,12 @@ void bc_triangulate_mesh(Mesh *me)
|
|||
BMesh *bm = BM_mesh_create(&bm_mesh_allocsize_default, &bm_create_params);
|
||||
BMeshFromMeshParams bm_from_me_params = {0};
|
||||
bm_from_me_params.calc_face_normal = true;
|
||||
BM_mesh_bm_from_me(bm, me, &bm_from_me_params);
|
||||
BM_mesh_bm_from_me(nullptr, bm, me, &bm_from_me_params);
|
||||
BM_mesh_triangulate(bm, quad_method, use_beauty, 4, tag_only, nullptr, nullptr, nullptr);
|
||||
|
||||
BMeshToMeshParams bm_to_me_params = {0};
|
||||
bm_to_me_params.calc_object_remap = false;
|
||||
BM_mesh_bm_to_me(nullptr, bm, me, &bm_to_me_params);
|
||||
BM_mesh_bm_to_me(nullptr, nullptr, bm, me, &bm_to_me_params);
|
||||
BM_mesh_free(bm);
|
||||
}
|
||||
|
||||
|
|
|
@ -673,8 +673,8 @@ typedef struct Brush {
|
|||
float mask_stencil_pos[2];
|
||||
float mask_stencil_dimension[2];
|
||||
|
||||
int _pad11;
|
||||
struct BrushGpencilSettings *gpencil_settings;
|
||||
|
||||
} Brush;
|
||||
|
||||
/* Struct to hold palette colors for sorting. */
|
||||
|
|
|
@ -68,7 +68,7 @@ Mesh *doEdgeSplit(const Mesh *mesh, EdgeSplitModifierData *emd)
|
|||
const bool do_split_all = do_split_angle && emd->split_angle < FLT_EPSILON;
|
||||
const bool calc_face_normals = do_split_angle && !do_split_all;
|
||||
|
||||
bm = BKE_mesh_to_bmesh_ex(ob,
|
||||
bm = BKE_mesh_to_bmesh_ex(NULL,
|
||||
mesh,
|
||||
&(struct BMeshCreateParams){0},
|
||||
&(struct BMeshFromMeshParams){
|
||||
|
@ -138,7 +138,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
|
|||
return mesh;
|
||||
}
|
||||
|
||||
result = doEdgeSplit(ctx->object, mesh, emd);
|
||||
result = doEdgeSplit(mesh, emd);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ Mesh *triangulate_mesh(Mesh *mesh,
|
|||
cd_mask_extra.lmask |= CD_MASK_NORMAL;
|
||||
}
|
||||
|
||||
bm = BKE_mesh_to_bmesh_ex(ob,
|
||||
bm = BKE_mesh_to_bmesh_ex(NULL,
|
||||
mesh,
|
||||
&((struct BMeshCreateParams){0}),
|
||||
&((struct BMeshFromMeshParams){
|
||||
|
@ -129,8 +129,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
|
|||
{
|
||||
TriangulateModifierData *tmd = (TriangulateModifierData *)md;
|
||||
Mesh *result;
|
||||
if (!(result = triangulate_mesh(ctx->object,
|
||||
mesh, tmd->quad_method, tmd->ngon_method, tmd->min_vertices, tmd->flag))) {
|
||||
if (!(result = triangulate_mesh(mesh, tmd->quad_method, tmd->ngon_method, tmd->min_vertices, tmd->flag))) {
|
||||
return mesh;
|
||||
}
|
||||
|
||||
|
|
|
@ -61,8 +61,8 @@ static Mesh *mesh_boolean_calc(const Mesh *mesh_a, const Mesh *mesh_b, int boole
|
|||
{
|
||||
struct BMeshFromMeshParams bmesh_from_mesh_params = {0};
|
||||
bmesh_from_mesh_params.calc_face_normal = true;
|
||||
BM_mesh_bm_from_me(bm, mesh_b, &bmesh_from_mesh_params);
|
||||
BM_mesh_bm_from_me(bm, mesh_a, &bmesh_from_mesh_params);
|
||||
BM_mesh_bm_from_me(NULL, bm, mesh_b, &bmesh_from_mesh_params);
|
||||
BM_mesh_bm_from_me(NULL, bm, mesh_a, &bmesh_from_mesh_params);
|
||||
}
|
||||
|
||||
const int looptris_tot = poly_to_tri_count(bm->totface, bm->totloop);
|
||||
|
|
Loading…
Reference in New Issue