From f56a9fbad528c7aebce23f065842aa71450c75eb Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Thu, 31 May 2018 13:42:55 +0200 Subject: Depsgraph: Remove the "disable-copy-on-write" option completely After discussion with Sergey and Dalai, we have decided to remove this option completely. We're getting to the point where it is almost impossible to really use 2.8 without COW, and keeping the old option running ends up diverting dev resources away towards tracking down and fixing problems with a parallel system that will be going away. --- .../intern/builder/deg_builder_nodes_rig.cc | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc') diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc index c48381481f5..d3c4ce01674 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc @@ -145,16 +145,8 @@ void DepsgraphNodeBuilder::build_splineik_pose(Object *object, void DepsgraphNodeBuilder::build_rig(Object *object) { bArmature *armature = (bArmature *)object->data; - Scene *scene_cow; - Object *object_cow; - if (DEG_depsgraph_use_copy_on_write()) { - scene_cow = get_cow_datablock(scene_); - object_cow = get_cow_datablock(object); - } - else { - scene_cow = scene_; - object_cow = object; - } + Scene *scene_cow = get_cow_datablock(scene_); + Object *object_cow = get_cow_datablock(object); OperationDepsNode *op_node; /* Animation and/or drivers linking posebones to base-armature used to @@ -324,13 +316,7 @@ void DepsgraphNodeBuilder::build_proxy_rig(Object *object) { bArmature *arm = (bArmature *)object->data; OperationDepsNode *op_node; - Object *object_cow; - if (DEG_depsgraph_use_copy_on_write()) { - object_cow = get_cow_datablock(object); - } - else { - object_cow = object; - } + Object *object_cow = get_cow_datablock(object); /* Sanity check. */ BLI_assert(object->pose != NULL); /* Animation. */ -- cgit v1.2.3