diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 15:42:49 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 15:42:49 +0300 |
commit | db83f41bafacb429e8fb24ccc509aa91f5744146 (patch) | |
tree | db2f14df66891fb5740c1a5b5adf792914010b6e /source | |
parent | 40b3d951bca6d62ce61f2a1e2fa5955f2f964c8f (diff) | |
parent | 8988f383c1fb690bde976cc6de4438b327186203 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index d7ef1c19c61..31fc432ff58 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -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"); } |