diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-18 01:01:38 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-18 01:02:44 +0400 |
| commit | 1a4b718582efdfc39e81e86577d5d25a6bed9e98 (patch) | |
| tree | 286110fb8010db3a48227694181c2096e93a0427 /source/blender/blenkernel/intern/curve.c | |
| parent | f1aeb2ccf4deb4625f7ae59d673317d09b9580ca (diff) | |
Fix crash on file load with linked groups and curve bevel.
This isn't a proper fix, curve_cache should not be NULL, but it makes it
possible to open the file at least.
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
| -rw-r--r-- | source/blender/blenkernel/intern/curve.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 2454c104755..354528e5673 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1647,9 +1647,12 @@ void BKE_curve_bevel_make(Scene *scene, Object *ob, ListBase *disp, int forRende BKE_displist_make_curveTypes_forRender(scene, cu->bevobj, &bevdisp, NULL, 0, renderResolution); dl = bevdisp.first; } + else if (cu->bevobj->curve_cache) { + dl = cu->bevobj->curve_cache->disp.first; + } else { BLI_assert(cu->bevobj->curve_cache != NULL); - dl = cu->bevobj->curve_cache->disp.first; + dl = NULL; } while (dl) { |