diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 21:23:16 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-25 21:23:16 +0300 |
commit | 1e73c400a7b300dbbec58cd7f33c2970652ad23c (patch) | |
tree | 1cb47f687af19e30113d3cbf857267653f86cbb5 /source/blender/blenkernel/intern/curve.c | |
parent | 7f8df735ae89b36086b3aa555ad50a656d1a4764 (diff) | |
parent | 2cdcb1c1716180c00c23feb8332f17c2bab74864 (diff) |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/makesrna/intern/rna_nodetree.c
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 9f83ffa2577..2c55896e598 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -2546,7 +2546,8 @@ void BKE_curve_bevelList_free(ListBase *bev) } MEM_freeN(bl); } - bev->first = bev->last = NULL; + + BLI_listbase_clear(bev); } void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render) |