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 | |
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')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 6 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 10 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_edgesplit.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 2fbec392b1e..05fcb04d7ea 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -186,11 +186,11 @@ static void bm_merge_dm_transform(BMesh* bm, DerivedMesh *dm, float mat[4][4]) } static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, - Scene *scene, Object *ob, DerivedMesh *dm, - int UNUSED(initFlags)) + Scene *scene, Object *ob, DerivedMesh *dm, + int UNUSED(initFlags)) { DerivedMesh *result; - BMEditMesh *em = DM_to_editbmesh(ob, dm, NULL, FALSE); + BMEditMesh *em = DM_to_editbmesh(dm, NULL, FALSE); BMOperator op, oldop, weldop; int i, j, indexLen; /* offset matrix */ 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); diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 481ab805c5a..9fb4821229c 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -57,7 +57,7 @@ #define EDGE_MARK 1 -static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Object *ob) +static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Object *UNUSED(ob)) { DerivedMesh *result; BMesh *bm; @@ -66,7 +66,7 @@ static DerivedMesh *doEdgeSplit(DerivedMesh *dm, EdgeSplitModifierData *emd, Obj BMEdge *e; float threshold = cos((emd->split_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); |