Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_relations.cc
index ae12d00e035227792d0f92f8966ab8dcf9255f0b..27a24031911401ed3b43ec5510b3760adc90dc9d 100644 (file)
@@ -1489,28 +1489,13 @@ void DepsgraphRelationBuilder::build_obdata_geom(Main *bmain, Scene *scene, Obje
        }
 
        /* materials */
-       if (ob->totcol != 0) {
-               ComponentKey object_shading_key(&ob->id, DEPSNODE_TYPE_SHADING);
+       if (ob->totcol) {
                for (int a = 1; a <= ob->totcol; a++) {
                        Material *ma = give_current_material(ob, a);
                        if (ma != NULL) {
                                build_material(ma);
-                               ComponentKey material_shading_key(&ma->id,
-                                                                 DEPSNODE_TYPE_SHADING);
-                               add_relation(material_shading_key,
-                                            object_shading_key,
-                                            DEPSREL_TYPE_UPDATE,
-                                            "Object Shading");
                        }
                }
-               OperationKey obdata_geom_done_key(obdata,
-                                                 DEPSNODE_TYPE_GEOMETRY,
-                                                 DEG_OPCODE_PLACEHOLDER,
-                                                 "Eval Done");
-               add_relation(geom_key,
-                            object_shading_key,
-                            DEPSREL_TYPE_UPDATE,
-                            "Object Shading");
        }
 
        /* geometry collision */