Depsgraph: remove EvaluationContext, pass Depsgraph instead.

The depsgraph was always created within a fixed evaluation context. Passing
both risks the depsgraph and evaluation context not matching, and it
complicates the Python API where we'd have to expose both which is not so
easy to understand.

This also removes the global evaluation context in main, which assumed there
to be a single active scene and view layer.

Differential Revision: https://developer.blender.org/D3152

1 files changed, 1 insertions, 10 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index c1fa86d4653..29d14442a47 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -80,16 +80,8 @@ NodeGroup *BlenderFileLoader::Load()
 	}
 
 	ViewLayer *view_layer = (ViewLayer*)BLI_findstring(&_re->scene->view_layers, _view_layer->name, offsetof(ViewLayer, name));
-
-	EvaluationContext *eval_ctx = DEG_evaluation_context_new(DAG_EVAL_RENDER);
 	Depsgraph *depsgraph = DEG_graph_new(_re->scene, view_layer, DAG_EVAL_RENDER);
 
-	DEG_evaluation_context_init_from_view_layer_for_render(
-		eval_ctx,
-		depsgraph,
-		_re->scene,
-		view_layer);
-
 	BKE_scene_graph_update_tagged(depsgraph, _re->main);
 
 #if 0
@@ -116,7 +108,7 @@ NodeGroup *BlenderFileLoader::Load()
 		bool apply_modifiers = true;
 		bool calc_undeformed = false;
 		bool calc_tessface = false;
-		Mesh *mesh = BKE_mesh_new_from_object(eval_ctx,
+		Mesh *mesh = BKE_mesh_new_from_object(depsgraph,
 		                                      _re->main,
 		                                      _re->scene,
 		                                      ob,
@@ -132,7 +124,6 @@ NodeGroup *BlenderFileLoader::Load()
 	DEG_OBJECT_ITER_END;
 
 	DEG_graph_free(depsgraph);
-	DEG_evaluation_context_free(eval_ctx);
 
 	// Return the built scene.
 	return _Scene;