fix for recent commit - would crash adding materials on an object without any.

2012-08-14 12:17:06 +00:00
parent 53333c78ce
commit 34ebdcacfc
1 changed files with 1 additions and 1 deletions
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -808,7 +808,7 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type)
 	}

 	// 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];
 	}