diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-03 16:42:55 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-04 15:02:58 +0300 |
| commit | d8a03c77d796db4ae2546fbcbe230dbf4846b0ea (patch) | |
| tree | df3426bdeb08321f7654bfe0ca5f814469c2d384 /source/blender/blenkernel/intern/mesh_merge.c | |
| parent | 4880e2e75a860f4716e3122f5ae14f34f50a9452 (diff) | |
Allocate/free meshes with generic library functions.
This avoids the need to use Mesh-specific functions, and makes allocation
and freeing easy oneliners.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh_merge.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh_merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mesh_merge.c b/source/blender/blenkernel/intern/mesh_merge.c index 78e470dda4e..899de970fdd 100644 --- a/source/blender/blenkernel/intern/mesh_merge.c +++ b/source/blender/blenkernel/intern/mesh_merge.c @@ -39,6 +39,7 @@ #include "BLI_ghash.h" #include "BKE_customdata.h" +#include "BKE_library.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" @@ -677,8 +678,7 @@ Mesh *BKE_mesh_merge_verts(Mesh *mesh, const int *vtargetmap, const int tot_vtar if (poly_map_mem != NULL) MEM_freeN(poly_map_mem); - BKE_mesh_free(mesh); - MEM_freeN(mesh); + BKE_id_free(NULL, mesh); return result; } |