[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58689] trunk/blender/source/blender: move alloca define into its own header since its not related to BLI_array
Sergej Reich
sergej.reich at googlemail.com
Sun Jul 28 14:16:46 CEST 2013
Hey Campbell, I think you forgot to actually add BLI_alloca.h ;)
Am Sonntag, den 28.07.2013, 10:38 +0000 schrieb Campbell Barton:
> Revision: 58689
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58689
> Author: campbellbarton
> Date: 2013-07-28 10:38:25 +0000 (Sun, 28 Jul 2013)
> Log Message:
> -----------
> move alloca define into its own header since its not related to BLI_array
>
> Modified Paths:
> --------------
> trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
> trunk/blender/source/blender/blenkernel/intern/anim_sys.c
> trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
> trunk/blender/source/blender/blenkernel/intern/mesh.c
> trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
> trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
> trunk/blender/source/blender/blenlib/BLI_array.h
> trunk/blender/source/blender/blenlib/CMakeLists.txt
> trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
> trunk/blender/source/blender/bmesh/intern/bmesh_core.c
> trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
> trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
> trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
> trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
> trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
> trunk/blender/source/blender/bmesh/operators/bmo_connect.c
> trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
> trunk/blender/source/blender/bmesh/operators/bmo_fill_holes.c
> trunk/blender/source/blender/bmesh/operators/bmo_subdivide_edgering.c
> trunk/blender/source/blender/bmesh/operators/bmo_utils.c
> trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
> trunk/blender/source/blender/bmesh/tools/bmesh_triangulate.c
> trunk/blender/source/blender/editors/mesh/editmesh_knife.c
> trunk/blender/source/blender/editors/mesh/editmesh_utils.c
> trunk/blender/source/blender/editors/mesh/mesh_data.c
> trunk/blender/source/blender/editors/transform/transform_conversions.c
> trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
> trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
> trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
> trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
> trunk/blender/source/blender/makesrna/intern/rna_mesh.c
> trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
>
> Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -46,7 +46,6 @@
> #include "BLI_blenlib.h"
> #include "BLI_math.h"
> #include "BLI_memarena.h"
> -#include "BLI_array.h"
> #include "BLI_utildefines.h"
> #include "BLI_linklist.h"
>
>
> Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -39,8 +39,8 @@
> #include "MEM_guardedalloc.h"
>
> #include "BLI_utildefines.h"
> -#include "BLI_array.h"
> #include "BLI_blenlib.h"
> +#include "BLI_alloca.h"
> #include "BLI_dynstr.h"
>
> #include "BLF_translation.h"
>
> Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -40,7 +40,6 @@
> #include "BLI_blenlib.h"
> #include "BLI_edgehash.h"
> #include "BLI_math.h"
> -#include "BLI_array.h"
> #include "BLI_smallhash.h"
> #include "BLI_utildefines.h"
> #include "BLI_scanfill.h"
>
> Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -51,6 +51,7 @@
> #include "BLI_bitmap.h"
> #include "BLI_scanfill.h"
> #include "BLI_array.h"
> +#include "BLI_alloca.h"
>
> #include "BKE_animsys.h"
> #include "BKE_main.h"
>
> Modified: trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -28,13 +28,13 @@
> * \ingroup bke
> */
>
> +#include "MEM_guardedalloc.h"
> +
> #include "BLI_math.h"
> +#include "BLI_alloca.h"
>
> -#include "MEM_guardedalloc.h"
> -
> #include "DNA_object_types.h"
>
> -#include "BLI_array.h"
>
> #include "BKE_DerivedMesh.h"
> #include "BKE_editmesh.h"
>
> Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -69,7 +69,6 @@
> #include "PIL_time.h"
>
> #ifndef USE_DYNSIZE
> -# include "BLI_array.h"
> #endif
>
> #include "GL/glew.h"
>
> Modified: trunk/blender/source/blender/blenlib/BLI_array.h
> ===================================================================
> --- trunk/blender/source/blender/blenlib/BLI_array.h 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenlib/BLI_array.h 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -173,31 +173,4 @@
> MEM_freeN(arr); \
> } (void)0
>
> -
> -/* alloca */
> -#ifdef _MSC_VER
> -# define alloca _alloca
> -#endif
> -
> -#if defined(__MINGW32__)
> -# include <malloc.h> /* mingw needs for alloca() */
> -#endif
> -
> -#if defined(__GNUC__) || defined(__clang__)
> -#define BLI_array_alloca(arr, realsize) \
> - (typeof(arr))alloca(sizeof(*arr) * (realsize))
> -
> -#define BLI_array_alloca_and_count(arr, realsize) \
> - (typeof(arr))alloca(sizeof(*arr) * (realsize)); \
> - const int _##arr##_count = (realsize)
> -
> -#else
> -#define BLI_array_alloca(arr, realsize) \
> - alloca(sizeof(*arr) * (realsize))
> -
> -#define BLI_array_alloca_and_count(arr, realsize) \
> - alloca(sizeof(*arr) * (realsize)); \
> - const int _##arr##_count = (realsize)
> -#endif
> -
> #endif /* __BLI_ARRAY_H__ */
>
> Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/blenlib/CMakeLists.txt 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -99,6 +99,7 @@
> intern/winstuff.c
>
> BLI_args.h
> + BLI_alloca.h
> BLI_array.h
> BLI_bitmap.h
> BLI_blenlib.h
>
> Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -33,7 +33,7 @@
>
> #include "MEM_guardedalloc.h"
>
> -#include "BLI_array.h"
> +#include "BLI_alloca.h"
> #include "BLI_math.h"
>
> #include "BKE_customdata.h"
>
> Modified: trunk/blender/source/blender/bmesh/intern/bmesh_core.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/intern/bmesh_core.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -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 @@
> */
> 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 @@
> 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_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 @@
> 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]);
> }
> }
>
> Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -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"
>
> Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/intern/bmesh_mesh_conv.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -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"
>
> Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -34,7 +34,6 @@
> #include "BLI_memarena.h"
> #include "BLI_mempool.h"
> #include "BLI_listbase.h"
> -#include "BLI_array.h"
>
> #include "BLF_translation.h"
>
>
> Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -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"
>
>
> Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -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"
>
> Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -29,8 +29,8 @@
> #include "MEM_guardedalloc.h"
>
> #include "BLI_math.h"
> -#include "BLI_array.h"
> #include "BLI_utildefines.h"
> +#include "BLI_alloca.h"
>
> #include "bmesh.h"
>
>
> Modified: trunk/blender/source/blender/bmesh/operators/bmo_dupe.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2013-07-28 09:36:21 UTC (rev 58688)
> +++ trunk/blender/source/blender/bmesh/operators/bmo_dupe.c 2013-07-28 10:38:25 UTC (rev 58689)
> @@ -28,8 +28,8 @@
>
> #include "MEM_guardedalloc.h"
>
> -#include "BLI_array.h"
> #include "BLI_math.h"
> +#include "BLI_alloca.h"
>
> #include "bmesh.h"
>
>
> Modified: trunk/blender/source/blender/bmesh/operators/bmo_fill_holes.c
> ===================================================================
> --- trunk/blender/source/blender/bmesh/operators/bmo_fill_holes.c 2013-07-28 09:36:21 UTC (rev 58688)
>
> @@ Diff output truncated at 10240 characters. @@
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
More information about the Bf-blender-cvs
mailing list