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/modifiers/intern/MOD_remesh.c | |
| 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/modifiers/intern/MOD_remesh.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index f5fa6abe37b..c9070cced7e 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -143,7 +143,7 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4]) } static DerivedMesh *applyModifier(ModifierData *md, - struct EvaluationContext *UNUSED(eval_ctx), + const struct EvaluationContext *UNUSED(eval_ctx), Object *UNUSED(ob), DerivedMesh *dm, ModifierApplyFlag UNUSED(flag)) @@ -205,7 +205,7 @@ static DerivedMesh *applyModifier(ModifierData *md, #else /* !WITH_MOD_REMESH */ static DerivedMesh *applyModifier(ModifierData *UNUSED(md), - struct EvaluationContext *UNUSED(eval_ctx), + const struct EvaluationContext *UNUSED(eval_ctx), Object *UNUSED(ob), DerivedMesh *derivedData, ModifierApplyFlag UNUSED(flag)) |