diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2020-10-19 04:10:16 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2020-10-19 04:10:16 +0300 |
| commit | f61d4b2e3aaed64c0fa2bdd7740e2173d785f8e5 (patch) | |
| tree | 44042429e8f522d9a360ad94684ce4bef81166d6 /source/blender/modifiers/intern/MOD_triangulate.c | |
| parent | 49f57d8de87370cebaefc8b0b33fb9206806d3b3 (diff) | |
* Improved multires projection some more in bmesh_interp.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_triangulate.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_triangulate.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index a193b5bec58..aa2b69ff2c4 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -48,7 +48,7 @@ #include "MOD_modifiertypes.h" #include "MOD_ui_common.h" -static Mesh *triangulate_mesh(Mesh *mesh, +static Mesh *triangulate_mesh(Object *ob, Mesh *mesh, const int quad_method, const int ngon_method, const int min_vertices, @@ -70,7 +70,8 @@ static Mesh *triangulate_mesh(Mesh *mesh, cd_mask_extra.lmask |= CD_MASK_NORMAL; } - bm = BKE_mesh_to_bmesh_ex(mesh, + bm = BKE_mesh_to_bmesh_ex(ob, + mesh, &((struct BMeshCreateParams){0}), &((struct BMeshFromMeshParams){ .calc_face_normal = true, @@ -118,11 +119,11 @@ static void initData(ModifierData *md) md->mode |= eModifierMode_Editmode; } -static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx), Mesh *mesh) +static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) { TriangulateModifierData *tmd = (TriangulateModifierData *)md; Mesh *result; - if (!(result = triangulate_mesh( + if (!(result = triangulate_mesh(ctx->object, mesh, tmd->quad_method, tmd->ngon_method, tmd->min_vertices, tmd->flag))) { return mesh; } |