[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49890] trunk/blender/source/blender/ blenkernel/intern/material.c: fix for recent commit - would crash adding materials on an object without any .

[Campbell Barton]

Revision: 49890
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49890
Author:   campbellbarton
Date:     2012-08-14 12:17:06 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
fix for recent commit - would crash adding materials on an object without any.

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

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2012-08-14 11:17:06 UTC (rev 49889)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2012-08-14 12:17:06 UTC (rev 49890)
@@ -808,7 +808,7 @@
 	}
 
 	// Determine the object/mesh linking
-	if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->actcol) {
+	if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->totcol && ob->actcol) {
 		/* copy from previous material */
 		bit = ob->matbits[ob->actcol - 1];
 	}