[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40034] branches/bmesh/blender/source/ blender/modifiers/intern: edits to new modifiers to work with bmesh

[Campbell Barton]

Revision: 40034
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40034
Author:   campbellbarton
Date:     2011-09-08 08:18:46 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
edits to new modifiers to work with bmesh

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgedit.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgedit.c	2011-09-08 08:08:31 UTC (rev 40033)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgedit.c	2011-09-08 08:18:46 UTC (rev 40034)
@@ -245,7 +245,7 @@
 	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 *applyModifierEM(ModifierData *md, Object *ob,
-                                    struct EditMesh *UNUSED(editData),
+                                    struct BMEditMesh *UNUSED(editData),
                                     DerivedMesh *derivedData)
 {
 	return applyModifier(md, ob, derivedData, 0, 1);

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgmix.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgmix.c	2011-09-08 08:08:31 UTC (rev 40033)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgmix.c	2011-09-08 08:18:46 UTC (rev 40034)
@@ -292,7 +292,7 @@
 	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 *applyModifierEM(ModifierData *md, Object *ob,
-                                    struct EditMesh *UNUSED(editData),
+                                    struct BMEditMesh *UNUSED(editData),
                                     DerivedMesh *derivedData)
 {
 	return applyModifier(md, ob, derivedData, 0, 1);

Modified: branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c	2011-09-08 08:08:31 UTC (rev 40033)
+++ branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvgproximity.c	2011-09-08 08:18:46 UTC (rev 40034)
@@ -405,7 +405,7 @@
 	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 @@
 					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 *applyModifierEM(ModifierData *md, Object *ob,
-                                    struct EditMesh *UNUSED(editData),
+                                    struct BMEditMesh *UNUSED(editData),
                                     DerivedMesh *derivedData)
 {
 	return applyModifier(md, ob, derivedData, 0, 1);