From 1b462e5a51458e36df886838ee272b4bb18ed4da Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 16 Aug 2017 12:45:11 +1000 Subject: 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. --- source/blender/blenkernel/intern/modifier.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern/modifier.c') diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index cefdbc3edc1..1a146dc67d1 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -757,7 +757,7 @@ void modifier_path_init(char *path, int path_maxlen, const char *name) /* wrapper around ModifierTypeInfo.applyModifier that ensures valid normals */ struct DerivedMesh *modwrap_applyModifier( - ModifierData *md, struct EvaluationContext *eval_ctx, + ModifierData *md, const struct EvaluationContext *eval_ctx, Object *ob, struct DerivedMesh *dm, ModifierApplyFlag flag) { @@ -771,7 +771,7 @@ struct DerivedMesh *modwrap_applyModifier( } struct DerivedMesh *modwrap_applyModifierEM( - ModifierData *md, struct EvaluationContext *eval_ctx, + ModifierData *md, const struct EvaluationContext *eval_ctx, Object *ob, struct BMEditMesh *em, DerivedMesh *dm, ModifierApplyFlag flag) @@ -786,7 +786,7 @@ struct DerivedMesh *modwrap_applyModifierEM( } void modwrap_deformVerts( - ModifierData *md, struct EvaluationContext *eval_ctx, + ModifierData *md, const struct EvaluationContext *eval_ctx, Object *ob, DerivedMesh *dm, float (*vertexCos)[3], int numVerts, ModifierApplyFlag flag) @@ -801,7 +801,7 @@ void modwrap_deformVerts( } void modwrap_deformVertsEM( - ModifierData *md, struct EvaluationContext *eval_ctx, Object *ob, + ModifierData *md, const struct EvaluationContext *eval_ctx, Object *ob, struct BMEditMesh *em, DerivedMesh *dm, float (*vertexCos)[3], int numVerts) { -- cgit v1.2.3