diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2020-12-09 00:37:00 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2020-12-09 00:37:00 +0300 |
| commit | 681e2b6134e8142d258fcbaafab0c8d9b19fac69 (patch) | |
| tree | 3acce773d6eb0ff2a35bc7068d4f5095b955f640 /source/blender/modifiers/intern/MOD_triangulate.c | |
| parent | 49bd2228cb56a958ce04ec05758bb90832c9cd54 (diff) | |
Fixes from merge
Diffstat (limited to 'source/blender/modifiers/intern/MOD_triangulate.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_triangulate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index 210be6b9fd1..1c92d19c68d 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -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; } |