diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-28 14:38:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-28 14:38:25 +0400 |
commit | 4982f200fadd15bb733128ae03ed737549e2657c (patch) | |
tree | c2756d5ea66603f34c3e1fb547bb008a4278d57e /source/blender/bmesh/intern | |
parent | 72f29170325e6c01afb667be209ea5939b445551 (diff) |
move alloca define into its own header since its not related to BLI_array
Diffstat (limited to 'source/blender/bmesh/intern')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_core.c | 9 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_queries.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 4d3653b1a82..1f7ace1ba6d 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -33,7 +33,7 @@ #include "MEM_guardedalloc.h" -#include "BLI_array.h" +#include "BLI_alloca.h" #include "BLI_math.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index eac4b304b12..f9e711a0dc3 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -30,6 +30,7 @@ #include "BLI_math_vector.h" #include "BLI_listbase.h" #include "BLI_array.h" +#include "BLI_alloca.h" #include "BLI_smallhash.h" #include "BLF_translation.h" @@ -594,7 +595,7 @@ static void bm_kill_only_loop(BMesh *bm, BMLoop *l) */ void BM_face_edges_kill(BMesh *bm, BMFace *f) { - BMEdge **edges = BLI_array_alloca_and_count(edges, f->len); + BMEdge **edges = BLI_array_alloca(edges, f->len); BMLoop *l_iter; BMLoop *l_first; int i = 0; @@ -604,7 +605,7 @@ void BM_face_edges_kill(BMesh *bm, BMFace *f) edges[i++] = l_iter->e; } while ((l_iter = l_iter->next) != l_first); - for (i = 0; i < BLI_array_count(edges); i++) { + for (i = 0; i < f->len; i++) { BM_edge_kill(bm, edges[i]); } } @@ -615,7 +616,7 @@ void BM_face_edges_kill(BMesh *bm, BMFace *f) */ void BM_face_verts_kill(BMesh *bm, BMFace *f) { - BMVert **verts = BLI_array_alloca_and_count(verts, f->len); + BMVert **verts = BLI_array_alloca(verts, f->len); BMLoop *l_iter; BMLoop *l_first; int i = 0; @@ -625,7 +626,7 @@ void BM_face_verts_kill(BMesh *bm, BMFace *f) verts[i++] = l_iter->v; } while ((l_iter = l_iter->next) != l_first); - for (i = 0; i < BLI_array_count(verts); i++) { + for (i = 0; i < f->len; i++) { BM_vert_kill(bm, verts[i]); } } diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 446d32de5d2..3e8a49a01fc 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -36,7 +36,7 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "BLI_array.h" +#include "BLI_alloca.h" #include "BLI_math.h" #include "BKE_customdata.h" diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 184fed59f01..81d4aad0fdf 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -84,7 +84,7 @@ #include "MEM_guardedalloc.h" #include "BLI_listbase.h" -#include "BLI_array.h" +#include "BLI_alloca.h" #include "BLI_math_vector.h" #include "BKE_mesh.h" diff --git a/source/blender/bmesh/intern/bmesh_operators.c b/source/blender/bmesh/intern/bmesh_operators.c index e0268d6b504..269501e1f02 100644 --- a/source/blender/bmesh/intern/bmesh_operators.c +++ b/source/blender/bmesh/intern/bmesh_operators.c @@ -34,7 +34,6 @@ #include "BLI_memarena.h" #include "BLI_mempool.h" #include "BLI_listbase.h" -#include "BLI_array.h" #include "BLF_translation.h" diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c index 1ecb3c2b9ac..297458eb1d6 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.c +++ b/source/blender/bmesh/intern/bmesh_polygon.c @@ -32,8 +32,8 @@ #include "MEM_guardedalloc.h" +#include "BLI_alloca.h" #include "BLI_math.h" -#include "BLI_array.h" #include "BLI_scanfill.h" #include "BLI_listbase.h" diff --git a/source/blender/bmesh/intern/bmesh_queries.c b/source/blender/bmesh/intern/bmesh_queries.c index 9dc5ae61d61..de601b19052 100644 --- a/source/blender/bmesh/intern/bmesh_queries.c +++ b/source/blender/bmesh/intern/bmesh_queries.c @@ -33,8 +33,8 @@ #include "MEM_guardedalloc.h" -#include "BLI_array.h" #include "BLI_math.h" +#include "BLI_alloca.h" #include "bmesh.h" #include "intern/bmesh_private.h" |