diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-08-16 05:45:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-16 05:46:04 +0300 |
commit | 1b462e5a51458e36df886838ee272b4bb18ed4da (patch) | |
tree | dd74f29b57df23219ad68d2579a6271c21e1eddb /source/blender/blenkernel/BKE_layer.h | |
parent | b68b26c265d0984da08773196c0d673881fd6c13 (diff) |
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.
Diffstat (limited to 'source/blender/blenkernel/BKE_layer.h')
-rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 0a26fe08016..5f95a69ed1e 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -144,13 +144,13 @@ void BKE_collection_engine_property_value_set_bool(struct IDProperty *props, con /* evaluation */ -void BKE_layer_eval_layer_collection_pre(struct EvaluationContext *eval_ctx, +void BKE_layer_eval_layer_collection_pre(const struct EvaluationContext *eval_ctx, struct Scene *scene, struct SceneLayer *scene_layer); -void BKE_layer_eval_layer_collection(struct EvaluationContext *eval_ctx, +void BKE_layer_eval_layer_collection(const struct EvaluationContext *eval_ctx, struct LayerCollection *layer_collection, struct LayerCollection *parent_layer_collection); -void BKE_layer_eval_layer_collection_post(struct EvaluationContext *eval_ctx, +void BKE_layer_eval_layer_collection_post(const struct EvaluationContext *eval_ctx, struct SceneLayer *scene_layer); /* iterators */ |