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

2 files changed, 2 insertions, 5 deletions

diff --git a/source/blender/editors/manipulator_library/manipulator_library_presets.c b/source/blender/editors/manipulator_library/manipulator_library_presets.c
index 7b8d2104992..cccf484f29d 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_presets.c
+++ b/source/blender/editors/manipulator_library/manipulator_library_presets.c
@@ -139,12 +139,9 @@ void ED_manipulator_draw_preset_facemap(
 		GPU_select_load_id(select_id);
 	}
 
-	EvaluationContext eval_ctx;
-	CTX_data_eval_ctx(C, &eval_ctx);
-
 	gpuPushMatrix();
 	gpuMultMatrix(ob->obmat);
-	ED_draw_object_facemap(&eval_ctx, scene, ob, color, facemap);
+	ED_draw_object_facemap(CTX_data_depsgraph(C), scene, ob, color, facemap);
 	gpuPopMatrix();
 
 	if (is_select) {
diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
index 2991c972f6e..29aff0a1250 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
@@ -191,7 +191,7 @@ static void dial_ghostarc_draw(
 }
 
 static void dial_ghostarc_get_angles(
-        const struct Depsgraph *depsgraph,
+        struct Depsgraph *depsgraph,
         const wmManipulator *mpr,
         const wmEvent *event,
         const ARegion *ar, const View3D *v3d,