From c7f9e9a80f474cde25fa3da574b2dd1259700481 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 16 Aug 2011 10:31:28 +0000 Subject: Fix #28273: Crash playing with Follow path+Bevel+Material Crash was caused by old refactor of displists. Added additional check to makeDispListCurveTypes. --- source/blender/blenkernel/intern/displist.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/blenkernel/intern/displist.c') diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 8f57490d057..c2ed6468643 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1369,6 +1369,11 @@ void makeDispListCurveTypes(Scene *scene, Object *ob, int forOrco) Curve *cu= ob->data; ListBase *dispbase; + /* The same check for duplis as in do_makeDispListCurveTypes. + Happens when curve used for constraint/bevel was converted to mesh. + check there is still needed for render displist and orco displists. */ + if(!ELEM3(ob->type, OB_SURF, OB_CURVE, OB_FONT)) return; + freedisplist(&(ob->disp)); dispbase= &(ob->disp); freedisplist(dispbase); -- cgit v1.2.3