Bugfix: Fix crashes with empty material slots

2 files changed, 8 insertions, 4 deletions

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 65d36d665db..79beb900306 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -622,8 +622,10 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
 		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);
+			}
 		}
 	}
 	
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 74f3d3ddb9d..b182a7308ac 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2607,8 +2607,10 @@ void BKE_object_handle_update(Scene *scene, Object *ob)
 				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);
+					}
 				}
 			}