diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-16 14:31:28 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-16 14:31:28 +0400 |
| commit | c7f9e9a80f474cde25fa3da574b2dd1259700481 (patch) | |
| tree | 793c00d648d01828109b632188648b37c8957184 /source/blender/blenkernel/intern/displist.c | |
| parent | 989f67f5228b5b92f91d39818b29571f8ed8ec24 (diff) | |
Fix #28273: Crash playing with Follow path+Bevel+Material
Crash was caused by old refactor of displists.
Added additional check to makeDispListCurveTypes.
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 5 |
1 files changed, 5 insertions, 0 deletions
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); |