Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_nodes.cc
index db575c0da7c79a96b4007565e99e2e1bc8148e9d..b87bbb60479543a8d673e4f9bf477c8e3219e2e3 100644 (file)
@@ -839,18 +839,11 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
        }
 
        /* materials */
-       if (ob->totcol != 0) {
-               for (int a = 1; a <= ob->totcol; a++) {
-                       Material *ma = give_current_material(ob, a);
-                       if (ma != NULL) {
-                               build_material(ma);
-                       }
+       for (int a = 1; a <= ob->totcol; a++) {
+               Material *ma = give_current_material(ob, a);
+               if (ma != NULL) {
+                       build_material(ma);
                }
-               add_operation_node(&ob->id,
-                                  DEPSNODE_TYPE_SHADING,
-                                  DEPSOP_TYPE_EXEC,
-                                  NULL,
-                                  DEG_OPCODE_PLACEHOLDER, "Material Update");
        }
 
        /* geometry collision */