kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

edits to new modifiers to work with bmesh

Browse Source
This commit is contained in:
Campbell Barton 2011-09-08 08:18:46 +00:00
parent 24c9369477
commit e7f21e58de
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/modifiers/intern/MOD_weightvgedit.c
View File

@ -245,7 +245,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
else else
ret = dm; ret = dm;
#else #else
ret = CDDM_copy(dm); ret = CDDM_copy(dm, 0);
rel_ret = 1; rel_ret = 1;
dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT); dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT);
if (dvert == NULL) { if (dvert == NULL) {
@ -290,7 +290,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
} }
static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
struct EditMesh *UNUSED(editData), struct BMEditMesh *UNUSED(editData),
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

4
source/blender/modifiers/intern/MOD_weightvgmix.c
View File

@ -292,7 +292,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
else else
ret = dm; ret = dm;
#else #else
ret = CDDM_copy(dm); ret = CDDM_copy(dm, 0);
rel_ret = 1; rel_ret = 1;
dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT); dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT);
if (dvert == NULL) { if (dvert == NULL) {
@ -430,7 +430,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
} }
static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
struct EditMesh *UNUSED(editData), struct BMEditMesh *UNUSED(editData),
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);

8
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@ -405,7 +405,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
else else
ret = dm; ret = dm;
#else #else
ret = CDDM_copy(dm); ret = CDDM_copy(dm, 0);
rel_ret = 1; rel_ret = 1;
dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT); dvert = ret->getVertDataArray(ret, CD_MDEFORMVERT);
if (dvert == NULL) { if (dvert == NULL) {
@ -459,8 +459,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
target_dm = CDDM_from_curve(obr); target_dm = CDDM_from_curve(obr);
else if (obr->type == OB_MESH) { else if (obr->type == OB_MESH) {
Mesh *me = (Mesh*)obr->data; Mesh *me = (Mesh*)obr->data;
if (me->edit_mesh) if (me->edit_btmesh)
target_dm = CDDM_from_editmesh((EditMesh*)me->edit_mesh, me); target_dm = CDDM_from_BMEditMesh(me->edit_btmesh, me, 0);
else else
target_dm = CDDM_from_mesh(me, obr); 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, static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
struct EditMesh *UNUSED(editData), struct BMEditMesh *UNUSED(editData),
DerivedMesh *derivedData) DerivedMesh *derivedData)
{ {
return applyModifier(md, ob, derivedData, 0, 1); return applyModifier(md, ob, derivedData, 0, 1);