edits to new modifiers to work with bmesh
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 08:18:46 +0000 (08:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Sep 2011 08:18:46 +0000 (08:18 +0000)
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/modifiers/intern/MOD_weightvgproximity.c

index 763a063567ba065b8303eea9b8cedecfd427f02e..19b6ddadddeb3cd83dbc6214a5e96936433eb544 100644 (file)
@@ -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);
index 7543b085b51f4814ea54e313983261385cb4d63b..9be92da51bedfd0e0ddc0db1b5a78d37fae97ec5 100644 (file)
@@ -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);
index 35f993e24b65af52f79114f151f5ffdc00a0a480..7eeec211b41337be06a703b439533ffacd089fd6 100644 (file)
@@ -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);