diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-20 12:05:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-20 12:05:23 +0400 |
| commit | bc44e81dfff0b185e5d6639a9b54499c20c1524a (patch) | |
| tree | 1392339bedaaa6fd5bed4d3c3db74a7324065429 /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 7db7d7f21032f29ddbfb0ef3715c028551658092 (diff) | |
fix own bug with uninitialized arrays in subdivide (from recent BLI_array.h update)
also quiet warning.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 87826dafe31..662cebd7204 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -2303,9 +2303,14 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap) #endif int *oldv = NULL, *olde = NULL, *oldl = NULL, *oldp = NULL; BLI_array_declare(oldv); BLI_array_declare(olde); BLI_array_declare(oldl); BLI_array_declare(oldp); - int i, j, c, totloop, totpoly; - + int i, j, c, totpoly; +#ifdef USE_LOOPS + int totloop; +#endif + +#ifdef USE_LOOPS totloop = dm->numLoopData; +#endif totpoly = dm->numPolyData; newv = MEM_mallocN(sizeof(int) * dm->numVertData, "newv vtable CDDM_merge_verts"); |