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

3 files changed, 7 insertions, 10 deletions

diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index d5230f74316..8e9d005df9c 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -42,7 +42,7 @@ struct bNodeTree;
 struct BakePixel;
 struct Depsgraph;
 struct Depsgraph;
-struct EvaluationContext;
+struct Depsgraph;
 struct IDProperty;
 struct Main;
 struct Object;
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index c5e8443374a..802413f3580 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -39,7 +39,6 @@
 struct bMovieHandle;
 struct bNodeTree;
 struct Depsgraph;
-struct EvaluationContext;
 struct Image;
 struct ImageFormatData;
 struct Main;
@@ -123,8 +122,6 @@ typedef struct RenderLayer {
 	/* optional saved endresult on disk */
 	void *exrhandle;
 
-	struct EvaluationContext eval_ctx;
-
 	ListBase passes;
 	
 } RenderLayer;
@@ -274,7 +271,7 @@ void RE_Database_FromScene(
 void RE_Database_CameraOnly(
         struct Render *re, struct Main *bmain, struct Scene *scene,
         unsigned int lay, int use_camera_view);
-void RE_Database_Preprocess(struct EvaluationContext *eavl_ctx, struct Render *re);
+void RE_Database_Preprocess(struct Depsgraph *depsgraph, struct Render *re);
 void RE_Database_Free(struct Render *re);
 
 /* project dbase again, when viewplane/perspective changed */
diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index 0021687efbd..cf0ff009190 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -38,7 +38,7 @@
 
 /* called by meshtools */
 struct DerivedMesh;
-struct EvaluationContext;
+struct Depsgraph;
 struct ImagePool;
 struct MTex;
 struct Scene;
@@ -56,7 +56,7 @@ float texture_value_blend(float tex, float out, float fact, float facg, int blen
 void RE_texture_rng_init(void);
 void RE_texture_rng_exit(void);
 
-struct Material *RE_sample_material_init(const struct EvaluationContext *eval_ctx, struct Material *orig_mat, struct Scene *scene);
+struct Material *RE_sample_material_init(struct Depsgraph *depsgraph, struct Material *orig_mat, struct Scene *scene);
 void RE_sample_material_free(struct Material *mat);
 void RE_sample_material_color(
         struct Material *mat, float color[3], float *alpha, const float volume_co[3], const float surface_co[3],
@@ -69,16 +69,16 @@ void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, flo
 struct PointDensity;
 
 void RE_point_density_cache(
-        const struct EvaluationContext *eval_ctx,
+        struct Depsgraph *depsgraph,
         struct PointDensity *pd);
 
 void RE_point_density_minmax(
-        const struct EvaluationContext *eval_ctx,
+        struct Depsgraph *depsgraph,
         struct PointDensity *pd,
         float r_min[3], float r_max[3]);
 
 void RE_point_density_sample(
-        const struct EvaluationContext *eval_ctx,
+        struct Depsgraph *depsgraph,
         struct PointDensity *pd,
         const int resolution,
         float *values);