diff options
author | Joshua Leung <aligorith@gmail.com> | 2018-05-31 14:42:55 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2018-05-31 14:43:00 +0300 |
commit | f56a9fbad528c7aebce23f065842aa71450c75eb (patch) | |
tree | 6100807916beeb9c350ae900ebfc5b4479889f90 /source/blender/depsgraph/intern/builder/deg_builder_nodes.h | |
parent | 9b4e56c091f0df255cc09607061d130847a5f438 (diff) |
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.
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_nodes.h')
-rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_nodes.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index 8b9d2d1a010..b7c5a33f2c0 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -33,7 +33,7 @@ #include "intern/builder/deg_builder_map.h" #include "intern/depsgraph_types.h" -#include "DEG_depsgraph.h" /* used for DEG_depsgraph_use_copy_on_write() */ +#include "DEG_depsgraph.h" struct Base; struct CacheFile; @@ -92,12 +92,7 @@ struct DepsgraphNodeBuilder { /* For a given COW datablock get corresponding original one. */ template<typename T> T *get_orig_datablock(const T *cow) const { - if (DEG_depsgraph_use_copy_on_write()) { - return (T *)cow->id.orig_id; - } - else { - return (T *)cow; - } + return (T *)cow->id.orig_id; } void begin_build(); |