diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-03-20 00:33:33 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-03-20 00:33:33 +0300 |
| commit | 7ccc17b98ce8e06428cdadffee10f7ba68fafa42 (patch) | |
| tree | 0be941f363a9d12f31ebc436a1a8806b6041e3e3 /source/blender/modifiers/intern/MOD_armature.c | |
| parent | 18494f8d33d09140c6e57e39dafb397fbba324bd (diff) | |
=bmesh= fixed bunches of modifier stack bugs
Diffstat (limited to 'source/blender/modifiers/intern/MOD_armature.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index fa39c197c7b..08d22f12448 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -137,13 +137,13 @@ static void deformVerts(ModifierData *md, Object *ob, } static void deformVertsEM( - ModifierData *md, Object *ob, struct EditMesh *editData, + ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData*) md; DerivedMesh *dm = derivedData; - if(!derivedData) dm = CDDM_from_editmesh(editData, ob->data); + if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data); armature_deform_verts(amd->object, ob, dm, vertexCos, NULL, numVerts, amd->deformflag, NULL, amd->defgrp_name); @@ -152,14 +152,14 @@ static void deformVertsEM( } static void deformMatricesEM( - ModifierData *md, Object *ob, struct EditMesh *editData, + ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData*) md; DerivedMesh *dm = derivedData; - if(!derivedData) dm = CDDM_from_editmesh(editData, ob->data); + if(!derivedData) dm = CDDM_from_BMEditMesh(editData, ob->data); armature_deform_verts(amd->object, ob, dm, vertexCos, defMats, numVerts, amd->deformflag, NULL, amd->defgrp_name); |