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, 6 insertions, 6 deletions

diff --git a/source/blender/render/intern/include/pointdensity.h b/source/blender/render/intern/include/pointdensity.h
index f122b3dc4c1..263fa44f9c4 100644
--- a/source/blender/render/intern/include/pointdensity.h
+++ b/source/blender/render/intern/include/pointdensity.h
@@ -37,14 +37,14 @@
  * Make point density kd-trees for all point density textures in the scene
  */
 
-struct EvaluationContext;
+struct Depsgraph;
 struct PointDensity;
 struct Render;
 struct TexResult;
 
 void free_pointdensity(struct PointDensity *pd);
-void cache_pointdensity(const struct EvaluationContext *eval_ctx, struct Render *re, struct PointDensity *pd);
-void make_pointdensities(const struct EvaluationContext *eval_ctx, struct Render *re);
+void cache_pointdensity(struct Depsgraph *depsgraph, struct Render *re, struct PointDensity *pd);
+void make_pointdensities(struct Depsgraph *depsgraph, struct Render *re);
 void free_pointdensities(struct Render *re);
 int pointdensitytex(struct Tex *tex, const float texvec[3], struct TexResult *texres);
 
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h
index 2c46138c7ea..9b0206fd05d 100644
--- a/source/blender/render/intern/include/render_types.h
+++ b/source/blender/render/intern/include/render_types.h
@@ -52,7 +52,7 @@
 
 #include "BLI_sys_types.h" // for intptr_t support
 
-struct EvaluationContext;
+struct Depsgraph;
 struct Object;
 struct MemArena;
 struct VertTableNode;
diff --git a/source/blender/render/intern/include/renderdatabase.h b/source/blender/render/intern/include/renderdatabase.h
index 1d1af7092c8..6b2deea57d8 100644
--- a/source/blender/render/intern/include/renderdatabase.h
+++ b/source/blender/render/intern/include/renderdatabase.h
@@ -40,7 +40,7 @@ extern "C" {
 struct Object;
 struct VlakRen;
 struct VertRen;
-struct EvaluationContext;
+struct Depsgraph;
 struct HaloRen;
 struct Main;
 struct Material;
@@ -165,7 +165,7 @@ void area_lamp_vectors(struct LampRen *lar);
 
 /* convertblender.c */
 void init_render_world(Render *re);
-void RE_Database_FromScene_Vectors(struct EvaluationContext *eval_ctx, Render *re, struct Main *bmain, struct Scene *sce, unsigned int lay);
+void RE_Database_FromScene_Vectors(struct Depsgraph *depsgraph, Render *re, struct Main *bmain, struct Scene *sce, unsigned int lay);
 
 #ifdef __cplusplus
 }