diff options
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_curve.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_lattice.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_util.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 55a2cab4a76..fe5893d0911 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -142,7 +142,7 @@ static void deformVertsEM( ArmatureModifierData *amd = (ArmatureModifierData*) md; DerivedMesh *dm = derivedData; - if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, 0); + if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, FALSE, TRUE); modifier_vgroup_cache(md, vertexCos); /* if next modifier needs original vertices */ @@ -166,7 +166,7 @@ static void deformMatricesEM( ArmatureModifierData *amd = (ArmatureModifierData*) md; DerivedMesh *dm = derivedData; - if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, 0); + if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, FALSE, TRUE); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 3c599d6eafd..73c4903b277 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -389,7 +389,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, BMO_pop(em->bm); BMEdit_RecalcTesselation(em); - cddm = CDDM_from_BMEditMesh(em, NULL, 0); + cddm = CDDM_from_BMEditMesh(em, NULL, FALSE, TRUE); BMEdit_Free(em); MEM_freeN(em); diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 1a3f8cdb7f3..7e573697762 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -159,7 +159,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, cddm->release(cddm); } - cddm = CDDM_from_BMEditMesh(em, NULL, 1); + cddm = CDDM_from_BMEditMesh(em, NULL, TRUE, TRUE); BMEdit_Free(em); MEM_freeN(em); diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index 945c5c5a583..ab9b509ee9c 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -129,7 +129,7 @@ static void deformVertsEM( { DerivedMesh *dm = derivedData; - if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, 0); + if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, FALSE, TRUE); deformVerts(md, ob, dm, vertexCos, numVerts, 0, 0); diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 2984a387fd8..da5e9ccc45f 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -108,7 +108,7 @@ static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Obj cddm->release(cddm); } - cddm = CDDM_from_BMEditMesh(em, NULL, 1); + cddm = CDDM_from_BMEditMesh(em, NULL, TRUE, TRUE); BMEdit_Free(em); MEM_freeN(em); diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index 605c057c855..2e8b5e3e6f3 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -124,7 +124,7 @@ static void deformVertsEM( { DerivedMesh *dm = derivedData; - if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, 0); + if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data, FALSE, TRUE); deformVerts(md, ob, dm, vertexCos, numVerts, 0, 0); diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 7fdbea19cfb..e9b60f33fa2 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -185,7 +185,7 @@ DerivedMesh *get_dm(Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float (* return dm; if(ob->type==OB_MESH) { - if(em) dm= CDDM_from_BMEditMesh(em, ob->data, 0); + if(em) dm= CDDM_from_BMEditMesh(em, ob->data, FALSE, TRUE); else dm = CDDM_from_mesh((struct Mesh *)(ob->data), ob); if(vertexCos) { diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 5961fae1aba..d20a914a531 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -338,7 +338,7 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editD if(use_dm) { if(!derivedData) - dm = CDDM_from_BMEditMesh(editData, ob->data, 0); + dm = CDDM_from_BMEditMesh(editData, ob->data, FALSE, TRUE); } deformVerts(md, ob, dm, vertexCos, numVerts, 0, 0); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 732a46cb8b6..022aa150d49 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -451,7 +451,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der else if (obr->type == OB_MESH) { Mesh *me = (Mesh*)obr->data; if (me->edit_btmesh) - target_dm = CDDM_from_BMEditMesh(me->edit_btmesh, me, 0); + target_dm = CDDM_from_BMEditMesh(me->edit_btmesh, me, FALSE, TRUE); else target_dm = CDDM_from_mesh(me, obr); } |