diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-09 21:02:45 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-13 13:57:50 +0400 |
| commit | b5592d86d6368b64bf33eed251cb6c389054d1d2 (patch) | |
| tree | 80521cda52a21837575e401df44ec6af4f39aa03 /source/blender/blenkernel/intern/curve.c | |
| parent | ba15dd595f91c694cd721ad880e930dea7e04501 (diff) | |
Remove direct displist creation from bevel code
BKE_curve_bevel_make() is only used from object_handle_update()
friends and never called directly. This means if there's no
display list ready for the bevel object it's something wrong
happened with DAG.
In fact, this check goes back to ancient era and from tests
it appears this check is no longer needed.
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 4898832d97c..efb9788fd79 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1649,11 +1649,8 @@ void BKE_curve_bevel_make(Scene *scene, Object *ob, ListBase *disp, int forRende dl = bevdisp.first; } else { - dl = cu->bevobj->curve_cache ? cu->bevobj->curve_cache->disp.first : NULL; - if (dl == NULL) { - BKE_displist_make_curveTypes(scene, cu->bevobj, 0); - dl = cu->bevobj->curve_cache->disp.first; - } + BLI_assert(cu->bevobj->curve_cache != NULL); + dl = cu->bevobj->curve_cache->disp.first; } while (dl) { |