diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 06:02:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-01 06:02:33 +0300 |
| commit | e4c9cf7088583353670e9783e0b0aecdf2a0c8df (patch) | |
| tree | a06c9fab7bcf8b51eac7986688ef9291b596f09f /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | 7b27b10fa6a6a7c4286f30ba2c625896e7ba3fe6 (diff) | |
| parent | 10fec1f153295c9bd60eaa96dfcd09d8cf1b3d91 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 1c3ff352126..9280341b4e4 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -361,7 +361,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, #ifdef USE_DYNSIZE CCGVertHDL fverts[nverts]; #else - BLI_array_empty(fverts); + BLI_array_clear(fverts); BLI_array_grow_items(fverts, nverts); #endif @@ -400,7 +400,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, DerivedMesh *dm, #ifdef USE_DYNSIZE CCGVertHDL fverts[nverts]; #else - BLI_array_empty(fverts); + BLI_array_clear(fverts); BLI_array_grow_items(fverts, nverts); #endif @@ -744,7 +744,7 @@ static void ss_sync_ccg_from_derivedmesh(CCGSubSurf *ss, #ifdef USE_DYNSIZE CCGVertHDL fVerts[mp->totloop]; #else - BLI_array_empty(fVerts); + BLI_array_clear(fVerts); BLI_array_grow_items(fVerts, mp->totloop); #endif @@ -4583,7 +4583,7 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm, *((int *)ccgSubSurf_getFaceUserData(ss, f)) = vertNum; #ifndef USE_DYNSIZE - BLI_array_empty(loopidx); + BLI_array_clear(loopidx); BLI_array_grow_items(loopidx, numVerts); #endif for (s = 0; s < numVerts; s++) { @@ -4591,7 +4591,7 @@ static void set_ccgdm_all_geometry(CCGDerivedMesh *ccgdm, } #ifndef USE_DYNSIZE - BLI_array_empty(vertidx); + BLI_array_clear(vertidx); BLI_array_grow_items(vertidx, numVerts); #endif for (s = 0; s < numVerts; s++) { |