diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-26 01:26:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-26 01:27:08 +0400 |
| commit | a5606fadbb32b69a1262cb80a8aa2a60189f4232 (patch) | |
| tree | 00af93cddb3ae52456ac3d475cc4d15ecf794c5a /source/blender/modifiers | |
| parent | 07ebe893643c433d3fa09d120f780ef14b88f4b3 (diff) | |
Code Cleanup: remove object arg to CDDM_from_mesh mesh_create_derived
Diffstat (limited to 'source/blender/modifiers')
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 3ab7bff0e63..e81fc44f238 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -179,7 +179,7 @@ static void deformMatrices(ModifierData *md, Object *ob, DerivedMesh *derivedDat ArmatureModifierData *amd = (ArmatureModifierData *) md; DerivedMesh *dm = derivedData; - if (!derivedData) dm = CDDM_from_mesh((Mesh *)ob->data, ob); + if (!derivedData) dm = CDDM_from_mesh((Mesh *)ob->data); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 9335d7577c7..1f24662960a 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -116,7 +116,7 @@ static void deformVerts(ModifierData *md, Object *ob, /* if possible use/create DerivedMesh */ if (derivedData) dm = CDDM_copy(derivedData); - else if (ob->type == OB_MESH) dm = CDDM_from_mesh(ob->data, ob); + else if (ob->type == OB_MESH) dm = CDDM_from_mesh(ob->data); if (!ob->pd) { printf("CollisionModifier deformVerts: Should not happen!\n"); diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index a46314cd749..62a02928920 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -183,7 +183,7 @@ DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, } else if (ob->type == OB_MESH) { if (em) dm = CDDM_from_editbmesh(em, FALSE, FALSE); - else dm = CDDM_from_mesh((struct Mesh *)(ob->data), ob); + else dm = CDDM_from_mesh((struct Mesh *)(ob->data)); if (vertexCos) { CDDM_apply_vert_coords(dm, vertexCos); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 06f4664c11b..ecb99974472 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -473,7 +473,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der if (me->edit_btmesh) target_dm = CDDM_from_editbmesh(me->edit_btmesh, FALSE, FALSE); else - target_dm = CDDM_from_mesh(me, obr); + target_dm = CDDM_from_mesh(me); } free_target_dm = TRUE; } |