From eefae747dadd0b9febfa6641307d6a898a13a1d4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 14 Nov 2018 11:43:25 +0100 Subject: Depsgraph: Remove meaningless evaluation mode With the current implementation it only confuses logic around checks like vewport/render subdivision levels. If this mode is really needed for any decision making, implement this properly. --- source/blender/depsgraph/DEG_depsgraph.h | 1 - source/blender/depsgraph/intern/depsgraph_query_filter.cc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/depsgraph') diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index fa2675297bc..c87ba188677 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -71,7 +71,6 @@ struct ViewLayer; typedef enum eEvaluationMode { DAG_EVAL_VIEWPORT = 0, /* evaluate for OpenGL viewport */ DAG_EVAL_RENDER = 1, /* evaluate for render purposes */ - DAG_EVAL_BACKGROUND = 2, /* evaluate in background for baking/caching */ } eEvaluationMode; /* DagNode->eval_flags */ diff --git a/source/blender/depsgraph/intern/depsgraph_query_filter.cc b/source/blender/depsgraph/intern/depsgraph_query_filter.cc index 83963e7e5b2..1b44d4229e6 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_filter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_filter.cc @@ -200,7 +200,7 @@ Depsgraph *DEG_graph_filter(const Depsgraph *graph_src, Main *bmain, DEG_FilterQ /* TODO: Improve the builders to not add any ID nodes we don't need later (e.g. ProxyBuilder?) */ Depsgraph *graph_new = DEG_graph_new(deg_graph_src->scene, deg_graph_src->view_layer, - DAG_EVAL_BACKGROUND); + deg_graph_src->mode); DEG_graph_build_from_view_layer(graph_new, bmain, deg_graph_src->scene, -- cgit v1.2.3