diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-25 15:54:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-25 15:54:34 +0300 |
| commit | 4b8d7a143e491611581dc1e749e34eaec67e4377 (patch) | |
| tree | d1e980c613767e9a298e907a2c8cff29518a798f /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | cdfc4c0d1dbb6ae2dde8dd262cab5b69e9389b7c (diff) | |
| parent | 13b6867d1fd21721bfd1a46501815faa6f6fa375 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 33540c8746b..a022ef14506 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1530,7 +1530,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap, const int MLoop *ml, *mloop = MEM_malloc_arrayN(totloop, sizeof(*mloop), __func__); int *oldl = MEM_malloc_arrayN(totloop, sizeof(*oldl), __func__); #ifdef USE_LOOPS - int newl = MEM_malloc_arrayN(totloop, sizeof(*newl), __func__); + int *newl = MEM_malloc_arrayN(totloop, sizeof(*newl), __func__); #endif STACK_DECLARE(mloop); STACK_DECLARE(oldl); |