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/BKE_DerivedMesh.h | |
| 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/BKE_DerivedMesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 87ba2092437..b8cedfb5708 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -447,12 +447,12 @@ int DM_release(DerivedMesh *dm); */ void DM_to_mesh(DerivedMesh *dm, struct Mesh *me, struct Object *ob); -struct BMEditMesh *DM_to_editbmesh(struct Object *ob, struct DerivedMesh *dm, +struct BMEditMesh *DM_to_editbmesh(struct DerivedMesh *dm, struct BMEditMesh *existing, int do_tesselate); /* conversion to bmesh only */ void DM_to_bmesh_ex(struct DerivedMesh *dm, struct BMesh *bm); -struct BMesh *DM_to_bmesh(struct Object *ob, struct DerivedMesh *dm); +struct BMesh *DM_to_bmesh(struct DerivedMesh *dm); /* utility function to convert a DerivedMesh to a shape key block |