diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-29 19:45:14 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-29 19:45:14 +0300 |
commit | 172aa404d83de2f1f67003d21c2194da72b0ef8b (patch) | |
tree | 0323872e8f71acc4a52dfb4df323018854966755 /source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | |
parent | 62d5a0353d708fb8c30af2ef35ce2288bae4cb51 (diff) | |
parent | 75eb219a2e21abe9c9909d76f85abbb538d8ef9f (diff) |
Merge branch 'blender2.8' into id_override_staticid_override_static
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes.cc')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index a2a0f633fd9..121db9a4c5f 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -583,7 +583,6 @@ void DepsgraphNodeBuilder::build_object_transform(Object *object) op_node = add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM, function_bind(BKE_object_eval_local_transform, _1, - scene_cow, ob_cow), DEG_OPCODE_TRANSFORM_LOCAL); op_node->set_as_entry(); @@ -607,7 +606,6 @@ void DepsgraphNodeBuilder::build_object_transform(Object *object) add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM, function_bind(BKE_object_eval_uber_transform, _1, - scene_cow, ob_cow), DEG_OPCODE_TRANSFORM_OBJECT_UBEREVAL); |