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, 3 insertions, 5 deletions

diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index cb01efb2cf4..75b4063f3c4 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -230,7 +230,6 @@ static void find_iobject(const IObject &object, IObject &ret,
 }
 
 struct ExportJobData {
-	EvaluationContext eval_ctx;
 	Scene *scene;
 	ViewLayer *view_layer;
 	Depsgraph *depsgraph;
@@ -265,12 +264,13 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo
 
 	try {
 		Scene *scene = data->scene;
-		AbcExporter exporter(data->bmain, &data->eval_ctx, scene, data->depsgraph, data->filename, data->settings);
+		ViewLayer *view_layer = data->view_layer;
+		AbcExporter exporter(data->bmain, scene, view_layer, data->depsgraph, data->filename, data->settings);
 
 		const int orig_frame = CFRA;
 
 		data->was_canceled = false;
-		exporter(data->bmain, *data->progress, data->was_canceled);
+		exporter(*data->progress, data->was_canceled);
 
 		if (CFRA != orig_frame) {
 			CFRA = orig_frame;
@@ -314,8 +314,6 @@ bool ABC_export(
 {
 	ExportJobData *job = static_cast<ExportJobData *>(MEM_mallocN(sizeof(ExportJobData), "ExportJobData"));
 
-	CTX_data_eval_ctx(C, &job->eval_ctx);
-
 	job->scene = scene;
 	job->view_layer = CTX_data_view_layer(C);
 	job->depsgraph = CTX_data_depsgraph(C);