svn merge -r39433:39493 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / source / blender / blenkernel / intern / displist.c

diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index 0f89533c8236f7cd7a95db66755b1ca1560f958e..ec8a59d51f090d7b22d422fba153a1ded4abaf92 100644 (file)
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -1371,6 +1371,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);