Commit: 1a4b718582efdfc39e81e86577d5d25a6bed9e98
Author: Brecht Van Lommel
Date: Mon Feb 17 22:01:38 2014 +0100
https://developer.blender.org/rB1a4b718582efdfc39e81e86577d5d25a6bed9e98
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.
===================================================================
M source/blender/blenkernel/intern/curve.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c
b/source/blender/blenkernel/intern/curve.c
index 2454c10..354528e 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) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
