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/blenkernel/intern/modifiers_bmesh.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/blenkernel/intern/modifiers_bmesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index 8fe8c9cbaed..46bdcc6fdd8 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -137,7 +137,7 @@ void DM_to_bmesh_ex(DerivedMesh *dm, BMesh *bm) /* converts a cddm to a BMEditMesh. if existing is non-NULL, the * new geometry will be put in there.*/ -BMEditMesh *DM_to_editbmesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, int do_tesselate) +BMEditMesh *DM_to_editbmesh(DerivedMesh *dm, BMEditMesh *existing, int do_tesselate) { BMEditMesh *em = existing; BMesh *bm; @@ -146,7 +146,7 @@ BMEditMesh *DM_to_editbmesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, i bm = em->bm; } else { - bm = BM_mesh_create(ob, &bm_mesh_allocsize_default); + bm = BM_mesh_create(&bm_mesh_allocsize_default); } DM_to_bmesh_ex(dm, bm); @@ -163,11 +163,11 @@ BMEditMesh *DM_to_editbmesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, i return em; } -BMesh *DM_to_bmesh(Object *ob, DerivedMesh *dm) +BMesh *DM_to_bmesh(DerivedMesh *dm) { BMesh *bm; - bm = BM_mesh_create(ob, &bm_mesh_allocsize_default); + bm = BM_mesh_create(&bm_mesh_allocsize_default); DM_to_bmesh_ex(dm, bm); |