diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-13 14:03:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-13 14:10:10 +0300 |
| commit | 865608156157951e1e1c1bda1906e5fbfd762ced (patch) | |
| tree | 24631ac3f740f45370516e5d1dcb05c602a7c5a5 | |
| parent | 3ee6b940dfd42a2251d1d3d44131f754d27769dd (diff) | |
Depsgraph: Remove obscure code which was only needed for old OSD implementation
| -rw-r--r-- | source/blender/depsgraph/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/depsgraph/DEG_depsgraph.h | 4 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 14 |
3 files changed, 0 insertions, 22 deletions
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index c9cdea34401..c39ce65a337 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -113,8 +113,4 @@ if(WITH_BOOST) add_definitions(-DHAVE_BOOST_FUNCTION_BINDINGS) endif() -if(WITH_OPENSUBDIV) - add_definitions(-DWITH_OPENSUBDIV) -endif() - blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index 7d827f48f9c..7e26987f936 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -80,10 +80,6 @@ enum { * who're using curve deform, where_on_path and so. */ DAG_EVAL_NEED_CURVE_PATH = 1, - /* Scene evaluation would need to have object's data on CPU, - * meaning no GPU shortcuts is allowed. - */ - DAG_EVAL_NEED_CPU = 2, }; #ifdef __cplusplus diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 2a24d72eb67..3652cfe61fe 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -380,20 +380,6 @@ DepsRelation *Depsgraph::add_new_relation(OperationDepsNode *from, } /* Create new relation, and add it to the graph. */ rel = OBJECT_GUARDED_NEW(DepsRelation, from, to, description); - /* TODO(sergey): Find a better place for this. */ -#ifdef WITH_OPENSUBDIV - ComponentDepsNode *comp_node = from->owner; - if (comp_node->type == DEG_NODE_TYPE_GEOMETRY) { - IDDepsNode *id_to = to->owner->owner; - IDDepsNode *id_from = from->owner->owner; - if (id_to != id_from && (id_to->id_orig->recalc & ID_RECALC_ALL)) { - if ((id_from->eval_flags & DAG_EVAL_NEED_CPU) == 0) { - id_from->tag_update(this); - id_from->eval_flags |= DAG_EVAL_NEED_CPU; - } - } - } -#endif return rel; } |