[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13648] trunk/blender/source/blender/src/ drawobject.c: * Fix for crash, drawing particle systems with 'col' set to draw strands in material colour, but no material (null pointer).

[Matt Ebb]

Revision: 13648
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13648
Author:   broken
Date:     2008-02-12 00:24:16 +0100 (Tue, 12 Feb 2008)

Log Message:
-----------
* Fix for crash, drawing particle systems with 'col' set to draw strands in material colour, but no material (null pointer).

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawobject.c

Modified: trunk/blender/source/blender/src/drawobject.c
===================================================================
--- trunk/blender/source/blender/src/drawobject.c	2008-02-11 22:18:41 UTC (rev 13647)
+++ trunk/blender/source/blender/src/drawobject.c	2008-02-11 23:24:16 UTC (rev 13648)
@@ -3046,7 +3046,7 @@
 
 	if(select)
 		cpack(0xFFFFFF);
-	else if(part->draw&PART_DRAW_MAT_COL)
+	else if((ma) && (part->draw&PART_DRAW_MAT_COL))
 		glColor3f(ma->r,ma->g,ma->b);
 	else
 		cpack(0);