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/blenkernel/intern/cdderivedmesh.c | |
| parent | d19d1b549746238c4c1a694a8d3781a1fd0cf49d (diff) | |
move STACK_* macros into BLI_stackdefines.h
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 798633c8c56..2d7e06c7308 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -40,6 +40,7 @@ #include "BLI_blenlib.h" #include "BLI_edgehash.h" #include "BLI_utildefines.h" +#include "BLI_stackdefines.h" #include "BKE_pbvh.h" #include "BKE_cdderivedmesh.h" @@ -2770,17 +2771,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int MEM_freeN(oldv); MEM_freeN(olde); MEM_freeN(oldl); - MEM_freeN(oldp); - - STACK_FREE(oldv); - STACK_FREE(olde); - STACK_FREE(oldl); - STACK_FREE(oldp); - - STACK_FREE(mvert); - STACK_FREE(medge); - STACK_FREE(mloop); - STACK_FREE(mpoly); + MEM_freeN(oldp);; BLI_edgehash_free(ehash, NULL); |