bmmesh api - use struct rather than int[4] to initialize mesh sizes.

also correct bad assert() in previous commit.

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/bmesh/operators/bmo_mesh_conv.c b/source/blender/bmesh/operators/bmo_mesh_conv.c
index 27a1b5459ed..9cab8cd5f91 100644
--- a/source/blender/bmesh/operators/bmo_mesh_conv.c
+++ b/source/blender/bmesh/operators/bmo_mesh_conv.c
@@ -137,10 +137,10 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op)
 		printf("shapekey <-> mesh mismatch!\n");
 	}
 	
-	CustomData_bmesh_init_pool(&bm->vdata, bm_mesh_allocsize_default[0]);
-	CustomData_bmesh_init_pool(&bm->edata, bm_mesh_allocsize_default[1]);
-	CustomData_bmesh_init_pool(&bm->ldata, bm_mesh_allocsize_default[2]);
-	CustomData_bmesh_init_pool(&bm->pdata, bm_mesh_allocsize_default[3]);
+	CustomData_bmesh_init_pool(&bm->vdata, bm_mesh_allocsize_default.totvert);
+	CustomData_bmesh_init_pool(&bm->edata, bm_mesh_allocsize_default.totedge);
+	CustomData_bmesh_init_pool(&bm->ldata, bm_mesh_allocsize_default.totloop);
+	CustomData_bmesh_init_pool(&bm->pdata, bm_mesh_allocsize_default.totface);
 
 	for (i = 0, mvert = me->mvert; i < me->totvert; i++, mvert++) {
 		v = BM_vert_create(bm, keyco && set_key ? keyco[i] : mvert->co, NULL);