diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 23:58:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-11 23:58:56 +0400 |
| commit | b330abc290622b32419ba084b8bc7e6a8ea9aaa2 (patch) | |
| tree | 62c0590af336f1028fd05ffd33c28b7dec0f0c3c /source/blender/modifiers/intern/MOD_bevel.c | |
| parent | 42b3463030b07ba3a87574c173e759e3bb15353b (diff) | |
remove Object member from BMesh struct - was only used for undo and BMEditMesh already stores an object pointer.
also fix for own mistake with mesh conversion refactor, shape key index was off by 1 when switching editmode.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_bevel.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 3e110909702..112b9398d23 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -105,10 +105,10 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) * note: this code is very close to MOD_edgesplit.c. * note: if 0'd code from trunk included below. */ -static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, - DerivedMesh *dm, - int UNUSED(useRenderParams), - int UNUSED(isFinalCalc)) +static DerivedMesh *applyModifier(ModifierData *md, struct Object *UNUSED(ob), + DerivedMesh *dm, + int UNUSED(useRenderParams), + int UNUSED(isFinalCalc)) { DerivedMesh *result; BMesh *bm; @@ -118,7 +118,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob, BevelModifierData *bmd = (BevelModifierData*) md; float threshold = cos((bmd->bevel_angle + 0.00001) * M_PI / 180.0); - em = DM_to_editbmesh(ob, dm, NULL, FALSE); + em = DM_to_editbmesh(dm, NULL, FALSE); bm = em->bm; BM_mesh_normals_update(bm, FALSE); |