diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-08 12:18:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-08 12:18:46 +0400 |
| commit | e7f21e58de3ac1c590a4a1180723a854e2a6e21a (patch) | |
| tree | ae910dbbabe8ff132ddb33d2da579e20a8502837 /source/blender/modifiers/intern | |
| parent | 24c936947735c74227684b7c5594c68c4cfdded8 (diff) | |
edits to new modifiers to work with bmesh
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgedit.c | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgmix.c | 4 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index 763a063567b..19b6ddaddde 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -245,7 +245,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der else ret = dm; #else - ret = CDDM_copy(dm); + ret = CDDM_copy(dm, 0); rel_ret = 1; dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT); if (dvert == NULL) { @@ -290,7 +290,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der } static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 7543b085b51..9be92da51be 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -292,7 +292,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der else ret = dm; #else - ret = CDDM_copy(dm); + ret = CDDM_copy(dm, 0); rel_ret = 1; dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT); if (dvert == NULL) { @@ -430,7 +430,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der } static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 35f993e24b6..7eeec211b41 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -405,7 +405,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der else ret = dm; #else - ret = CDDM_copy(dm); + ret = CDDM_copy(dm, 0); rel_ret = 1; dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT); if (dvert == NULL) { @@ -459,8 +459,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der target_dm = CDDM_from_curve(obr); else if (obr->type == OB_MESH) { Mesh *me = (Mesh*)obr->data; - if (me->edit_mesh) - target_dm = CDDM_from_editmesh((EditMesh*)me->edit_mesh, me); + if (me->edit_btmesh) + target_dm = CDDM_from_BMEditMesh(me->edit_btmesh, me, 0); else target_dm = CDDM_from_mesh(me, obr); } @@ -514,7 +514,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der } static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct EditMesh *UNUSED(editData), + struct BMEditMesh *UNUSED(editData), DerivedMesh *derivedData) { return applyModifier(md, ob, derivedData, 0, 1); |