diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-02 00:09:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-02 00:09:17 +0400 |
commit | 9aafe32147064a41aa653a95c89b50d9585ab3c1 (patch) | |
tree | 8d3f000b54f9adf3245548cb4586973ea5f3ec22 /source/blender/blenkernel | |
parent | d534f0e16dfdf3ed2a3360ad9f317a258cd8cc8e (diff) |
bmmesh api - use struct rather than int[4] to initialize mesh sizes.
also correct bad assert() in previous commit.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifiers_bmesh.c | 10 |
3 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 1d6e6be0fba..09525e23c6b 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -51,6 +51,7 @@ #include "BLI_mempool.h" #include "BLI_utildefines.h" +#include "BKE_utildefines.h" #include "BKE_customdata.h" #include "BKE_customdata_file.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index f9dc0ef0b93..33ef226f411 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -526,7 +526,7 @@ BMesh *BKE_mesh_to_bmesh(Mesh *me, Object *ob) { BMesh *bm; - bm = BM_mesh_create(ob, bm_mesh_allocsize_default); + bm = BM_mesh_create(ob, &bm_mesh_allocsize_default); BMO_op_callf(bm, "mesh_to_bmesh mesh=%p object=%p set_shapekey=%b", me, ob, TRUE); diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c index 6bca40be1e2..fb7e18e295e 100644 --- a/source/blender/blenkernel/intern/modifiers_bmesh.c +++ b/source/blender/blenkernel/intern/modifiers_bmesh.c @@ -143,8 +143,12 @@ BMEditMesh *DM_to_editbmesh(Object *ob, DerivedMesh *dm, BMEditMesh *existing, i BMEditMesh *em = existing; BMesh *bm; - if (em) bm = em->bm; - else bm = BM_mesh_create(ob, bm_mesh_allocsize_default); + if (em) { + bm = em->bm; + } + else { + bm = BM_mesh_create(ob, &bm_mesh_allocsize_default); + } DM_to_bmesh_ex(dm, bm); @@ -164,7 +168,7 @@ BMesh *DM_to_bmesh(Object *ob, DerivedMesh *dm) { BMesh *bm; - bm = BM_mesh_create(ob, bm_mesh_allocsize_default); + bm = BM_mesh_create(ob, &bm_mesh_allocsize_default); DM_to_bmesh_ex(dm, bm); |