diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/object_update.c | 4 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 2527b0f5092..c07ccdf8ee2 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -233,7 +233,8 @@ void BKE_object_eval_constraints( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob); -void BKE_object_eval_done(struct Depsgraph *depsgraph, struct Object *ob); +void BKE_object_eval_transform_final( + struct Depsgraph *depsgraph, struct Object *ob); bool BKE_object_eval_proxy_copy( struct Depsgraph *depsgraph, diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c index 267f64aa53f..ea6466bf80e 100644 --- a/source/blender/blenkernel/intern/object_update.c +++ b/source/blender/blenkernel/intern/object_update.c @@ -135,7 +135,7 @@ void BKE_object_eval_constraints(Depsgraph *depsgraph, BKE_constraints_clear_evalob(cob); } -void BKE_object_eval_done(Depsgraph *depsgraph, Object *ob) +void BKE_object_eval_transform_final(Depsgraph *depsgraph, Object *ob) { DEG_debug_print_eval(depsgraph, __func__, ob->id.name, ob); @@ -364,7 +364,7 @@ void BKE_object_eval_transform_all(Depsgraph *depsgraph, BKE_object_eval_constraints(depsgraph, scene, object); } BKE_object_eval_uber_transform(depsgraph, object); - BKE_object_eval_done(depsgraph, object); + BKE_object_eval_transform_final(depsgraph, object); } void BKE_object_eval_update_shading(Depsgraph *depsgraph, Object *object) diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index c2cb09ce980..e59de4224c0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -800,7 +800,7 @@ void DepsgraphNodeBuilder::build_object_transform(Object *object) /* object transform is done */ op_node = add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM, - function_bind(BKE_object_eval_done, + function_bind(BKE_object_eval_transform_final, _1, ob_cow), DEG_OPCODE_TRANSFORM_FINAL); |