Pass EvaluationContext instead of bContext

2.8x branch added bContext arg in many places,
pass eval-context instead since its not simple to reason about what
what nested functions do when they can access and change almost anything.

Also use const to prevent unexpected modifications.

This fixes crash loading files with shadows,
since off-screen buffers use a NULL context for rendering.

1 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 6c4a090904a..c86595cd509 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -658,18 +658,18 @@ void mesh_get_mapped_verts_coords(DerivedMesh *dm, float (*r_cos)[3], const int
 
 /* */
 DerivedMesh *mesh_get_derived_final(
-        struct EvaluationContext *eval_ctx, struct Scene *scene,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene,
         struct Object *ob, CustomDataMask dataMask);
 DerivedMesh *mesh_get_derived_deform(
-        struct EvaluationContext *eval_ctx, struct Scene *scene,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene,
         struct Object *ob, CustomDataMask dataMask);
 
 DerivedMesh *mesh_create_derived_for_modifier(
-        struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
         struct ModifierData *md, int build_shapekey_layers);
 
 DerivedMesh *mesh_create_derived_render(
-        struct EvaluationContext *eval_ctx, struct Scene *scene,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene,
         struct Object *ob, CustomDataMask dataMask);
 
 DerivedMesh *getEditDerivedBMesh(
@@ -677,37 +677,37 @@ DerivedMesh *getEditDerivedBMesh(
         float (*vertexCos)[3]);
 
 DerivedMesh *mesh_create_derived_index_render(
-        struct EvaluationContext *eval_ctx, struct Scene *scene,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene,
         struct Object *ob, CustomDataMask dataMask, int index);
 
 /* same as above but wont use render settings */
 DerivedMesh *mesh_create_derived(struct Mesh *me, float (*vertCos)[3]);
 DerivedMesh *mesh_create_derived_view(
-        struct EvaluationContext *eval_ctx, struct Scene *scene,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene,
         struct Object *ob, CustomDataMask dataMask);
 DerivedMesh *mesh_create_derived_no_deform(
-        struct EvaluationContext *eval_ctx, struct Scene *scene,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene,
         struct Object *ob, float (*vertCos)[3],
         CustomDataMask dataMask);
 DerivedMesh *mesh_create_derived_no_deform_render(
-        struct EvaluationContext *eval_ctx, struct Scene *scene,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene,
         struct Object *ob, float (*vertCos)[3],
         CustomDataMask dataMask);
 /* for gameengine */
 DerivedMesh *mesh_create_derived_no_virtual(
-        struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
         float (*vertCos)[3], CustomDataMask dataMask);
 DerivedMesh *mesh_create_derived_physics(
-        struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob,
         float (*vertCos)[3], CustomDataMask dataMask);
 
 DerivedMesh *editbmesh_get_derived_base(
         struct Object *ob, struct BMEditMesh *em, CustomDataMask data_mask);
 DerivedMesh *editbmesh_get_derived_cage(
-        struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *,
         struct BMEditMesh *em, CustomDataMask dataMask);
 DerivedMesh *editbmesh_get_derived_cage_and_final(
-        struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *,
         struct BMEditMesh *em, CustomDataMask dataMask,
         DerivedMesh **r_final);
 
@@ -716,7 +716,7 @@ DerivedMesh *object_get_derived_final(struct Object *ob, const bool for_render);
 float (*editbmesh_get_vertex_cos(struct BMEditMesh *em, int *r_numVerts))[3];
 bool editbmesh_modifier_is_enabled(struct Scene *scene, struct ModifierData *md, DerivedMesh *dm);
 void makeDerivedMesh(
-        struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob, struct BMEditMesh *em,
+        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob, struct BMEditMesh *em,
         CustomDataMask dataMask, const bool build_shapekey_layers);
 
 void weight_to_rgb(float r_rgb[3], const float weight);