diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-06-24 18:01:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-24 18:01:33 +0400 |
commit | c5ccbacdaac7c5b2db0bc18c1ed514fd01d7d76d (patch) | |
tree | 9cb7f2d056c030af38db0bcda3be6fb4bec49eb3 /source/blender/modifiers | |
parent | d19d1b549746238c4c1a694a8d3781a1fd0cf49d (diff) |
move STACK_* macros into BLI_stackdefines.h
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciandeform.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_solidify.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index d3bd05baa6d..f613d6063fe 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -28,8 +28,9 @@ * \ingroup modifiers */ -#include "BLI_math.h" #include "BLI_utildefines.h" +#include "BLI_stackdefines.h" +#include "BLI_math.h" #include "BLI_string.h" #include "MEM_guardedalloc.h" @@ -623,7 +624,6 @@ static void initSystem(LaplacianDeformModifierData *lmd, Object *ob, DerivedMesh memcpy(sys->index_anchors, index_anchors, sizeof(int) * total_anchors); memcpy(sys->co, vertexCos, sizeof(float[3]) * numVerts); MEM_freeN(index_anchors); - STACK_FREE(index_anchors); lmd->vertexco = MEM_mallocN(sizeof(float[3]) * numVerts, "ModDeformCoordinates"); memcpy(lmd->vertexco, vertexCos, sizeof(float[3]) * numVerts); lmd->total_verts = numVerts; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 7d15147a3c6..14a6b631bd6 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -35,6 +35,7 @@ #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" +#include "BLI_stackdefines.h" #include "BLI_bitmap.h" #include "BLI_math.h" @@ -813,9 +814,6 @@ static DerivedMesh *applyModifier( MEM_freeN(edge_order); } - STACK_FREE(new_vert_arr); - STACK_FREE(new_edge_arr); - if (old_vert_arr) MEM_freeN(old_vert_arr); |