1 files changed, 4 insertions, 49 deletions

diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 85a0d336d28..73a0428c264 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -36,9 +36,6 @@
 #include "BLI_ghash.h"
 
 extern "C" {
-#include "DNA_scene_types.h"
-
-#include "BKE_depsgraph.h"
 #include "BKE_scene.h"
 } /* extern "C" */
 
@@ -52,43 +49,9 @@ extern "C" {
 
 #include "intern/depsgraph.h"
 
-#ifdef WITH_LEGACY_DEPSGRAPH
-static bool use_legacy_depsgraph = true;
-#endif
-
 /* Unfinished and unused, and takes quite some pre-processing time. */
 #undef USE_EVAL_PRIORITY
 
-bool DEG_depsgraph_use_legacy(void)
-{
-#ifdef DISABLE_NEW_DEPSGRAPH
-	return true;
-#elif defined(WITH_LEGACY_DEPSGRAPH)
-	return use_legacy_depsgraph;
-#else
-	BLI_assert(!"Should not be used with new depsgraph");
-	return false;
-#endif
-}
-
-void DEG_depsgraph_switch_to_legacy(void)
-{
-#ifdef WITH_LEGACY_DEPSGRAPH
-	use_legacy_depsgraph = true;
-#else
-	BLI_assert(!"Should not be used with new depsgraph");
-#endif
-}
-
-void DEG_depsgraph_switch_to_new(void)
-{
-#ifdef WITH_LEGACY_DEPSGRAPH
-	use_legacy_depsgraph = false;
-#else
-	BLI_assert(!"Should not be used with new depsgraph");
-#endif
-}
-
 /* ****************** */
 /* Evaluation Context */
 
@@ -98,7 +61,7 @@ EvaluationContext *DEG_evaluation_context_new(int mode)
 	EvaluationContext *eval_ctx =
 		(EvaluationContext *)MEM_callocN(sizeof(EvaluationContext),
 		                                 "EvaluationContext");
-	eval_ctx->mode = mode;
+	DEG_evaluation_context_init(eval_ctx, mode);
 	return eval_ctx;
 }
 
@@ -127,22 +90,14 @@ void DEG_evaluate_on_refresh(EvaluationContext *eval_ctx,
 	/* Update time on primary timesource. */
 	DEG::TimeSourceDepsNode *tsrc = deg_graph->find_time_source();
 	tsrc->cfra = BKE_scene_frame_get(scene);
-	unsigned int layers = deg_graph->layers;
-	/* XXX(sergey): This works around missing updates in temp scenes used
-	 * by various scripts, but is weak and needs closer investigation.
-	 */
-	if (layers == 0) {
-		layers = scene->lay;
-	}
-	DEG::deg_evaluate_on_refresh(eval_ctx, deg_graph, layers);
+	DEG::deg_evaluate_on_refresh(eval_ctx, deg_graph);
 }
 
 /* Frame-change happened for root scene that graph belongs to. */
 void DEG_evaluate_on_framechange(EvaluationContext *eval_ctx,
                                  Main *bmain,
                                  Depsgraph *graph,
-                                 float ctime,
-                                 const unsigned int layers)
+                                 float ctime)
 {
 	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph);
 	/* Update time on primary timesource. */
@@ -151,7 +106,7 @@ void DEG_evaluate_on_framechange(EvaluationContext *eval_ctx,
 	tsrc->tag_update(deg_graph);
 	DEG::deg_graph_flush_updates(bmain, deg_graph);
 	/* Perform recalculation updates. */
-	DEG::deg_evaluate_on_refresh(eval_ctx, deg_graph, layers);
+	DEG::deg_evaluate_on_refresh(eval_ctx, deg_graph);
 }
 
 bool DEG_needs_eval(Depsgraph *graph)