Merge branch 'master' into blender2.8
[blender.git] / source / blender / depsgraph / intern / builder / deg_builder_nodes.cc
index d7ef1c19c612409df88b629934d0974a85b6ac90..ec60d86ec82598db323bcbc1409284aafa06e87b 100644 (file)
@@ -450,7 +450,7 @@ void DepsgraphNodeBuilder::build_object(Scene *scene, Object *ob)
                                break;
 
                        case OB_ARMATURE: /* Pose */
-                               if (ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from != NULL) {
+                               if (ID_IS_LINKED(ob) && ob->proxy_from != NULL) {
                                        build_proxy_rig(ob);
                                }
                                else {
@@ -834,10 +834,8 @@ void DepsgraphNodeBuilder::build_cloth(Scene *scene, Object *object)
 {
        Scene *scene_cow = get_cow_datablock(scene);
        Object *object_cow = get_cow_datablock(object);
-
-       ComponentDepsNode *cache_comp = add_component_node(&object->id,
-                                                          DEG_NODE_TYPE_CACHE);
-       add_operation_node(cache_comp,
+       add_operation_node(&object->id,
+                          DEG_NODE_TYPE_CACHE,
                           function_bind(BKE_object_eval_cloth,
                                         _1,
                                         scene_cow,
@@ -1087,7 +1085,6 @@ void DepsgraphNodeBuilder::build_lamp(Object *ob)
 
        build_animdata(&la->id);
 
-       /* node for obdata */
        add_operation_node(lamp_id,
                           DEG_NODE_TYPE_PARAMETERS,
                           NULL,
@@ -1252,7 +1249,6 @@ void DepsgraphNodeBuilder::build_cachefile(CacheFile *cache_file)
        /* Animation, */
        build_animdata(cache_file_id);
        /* Cache evaluation itself. */
-       add_component_node(cache_file_id, DEG_NODE_TYPE_CACHE);
        add_operation_node(cache_file_id, DEG_NODE_TYPE_CACHE, NULL,
                           DEG_OPCODE_PLACEHOLDER, "Cache File Update");
 }