[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48518] trunk/blender/source/blender/ blenkernel/intern: Bugfix: Fix crashes with empty material slots

[Joshua Leung]

Revision: 48518
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48518
Author:   aligorith
Date:     2012-07-03 05:46:44 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Bugfix: Fix crashes with empty material slots

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

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-07-03 05:36:36 UTC (rev 48517)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2012-07-03 05:46:44 UTC (rev 48518)
@@ -622,8 +622,10 @@
 		for (a = 1; a <= ob->totcol; a++) {
 			Material *ma = give_current_material(ob, a);
 			
-			/* recursively figure out if there are drivers, and hook these up to this object */
-			dag_add_material_driver_relations(dag, node, ma);
+			if (ma) {
+				/* recursively figure out if there are drivers, and hook these up to this object */
+				dag_add_material_driver_relations(dag, node, ma);
+			}
 		}
 	}
 	

Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c	2012-07-03 05:36:36 UTC (rev 48517)
+++ trunk/blender/source/blender/blenkernel/intern/object.c	2012-07-03 05:46:44 UTC (rev 48518)
@@ -2607,8 +2607,10 @@
 				for (a = 1; a <= ob->totcol; a++) {
 					Material *ma = give_current_material(ob, a);
 					
-					/* recursively update drivers for this material */
-					material_drivers_update(scene, ma, ctime);
+					if (ma) {
+						/* recursively update drivers for this material */
+						material_drivers_update(scene, ma, ctime);
+					}
 				}
 			}