diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-18 15:35:51 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-08-18 15:38:20 +0400 |
| commit | 6c7467e0da9cf241b1eac7dfe91e6aefe1d985ce (patch) | |
| tree | 29575be83368f2d641221d3bf3b3e93a17ae3865 /source/blender/blenkernel/intern/object.c | |
| parent | 05cb63ecf75095444c8ce2bc11b3067bb207d8bf (diff) | |
Fix T41085: Blender crashes when using "spline" or "segments" for bevel curve factor.
Root of the issue goes to the fact that bevel list calculation might drop some points
if they're at the same position. This made spline length calculation goes wrong.
Now the length of the bevel segments is stored in the bevel list, so values are
always reliable.
Initial patch by Lukas Treyer with some tweaks from me.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 6f1ffcdd5a9..ef4df8bd719 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -180,7 +180,7 @@ void BKE_object_free_curve_cache(Object *ob) { if (ob->curve_cache) { BKE_displist_free(&ob->curve_cache->disp); - BLI_freelistN(&ob->curve_cache->bev); + BKE_curve_bevelList_free(&ob->curve_cache->bev); if (ob->curve_cache->path) { free_path(ob->curve_cache->path); } @@ -322,7 +322,7 @@ void BKE_object_free_derived_caches(Object *ob) if (ob->curve_cache) { BKE_displist_free(&ob->curve_cache->disp); - BLI_freelistN(&ob->curve_cache->bev); + BKE_curve_bevelList_free(&ob->curve_cache->bev); if (ob->curve_cache->path) { free_path(ob->curve_cache->path); ob->curve_cache->path = NULL; @@ -408,7 +408,7 @@ void BKE_object_free_ex(Object *ob, bool do_id_user) /* Free runtime curves data. */ if (ob->curve_cache) { - BLI_freelistN(&ob->curve_cache->bev); + BKE_curve_bevelList_free(&ob->curve_cache->bev); if (ob->curve_cache->path) free_path(ob->curve_cache->path); MEM_freeN(ob->curve_cache); |