[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39440] trunk/blender/source/blender/ blenkernel/intern/displist.c: Fix #28273: Crash playing with Follow path+Bevel+Material

[Sergey Sharybin]

Revision: 39440
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39440
Author:   nazgul
Date:     2011-08-16 10:31:28 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
Fix #28273: Crash playing with Follow path+Bevel+Material

Crash was caused by old refactor of displists.
Added additional check to makeDispListCurveTypes.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/displist.c

Modified: trunk/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/displist.c	2011-08-16 10:01:19 UTC (rev 39439)
+++ trunk/blender/source/blender/blenkernel/intern/displist.c	2011-08-16 10:31:28 UTC (rev 39440)
@@ -1369,6 +1369,11 @@
 	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);