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/collada/ControllerExporter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/collada/ControllerExporter.h') diff --git a/source/blender/collada/ControllerExporter.h b/source/blender/collada/ControllerExporter.h index c96015c7817..a1d46c5aafb 100644 --- a/source/blender/collada/ControllerExporter.h +++ b/source/blender/collada/ControllerExporter.h @@ -66,12 +66,12 @@ public: bool add_instance_controller(Object *ob); - void export_controllers(struct EvaluationContext *eval_ctx, Scene *sce); + void export_controllers(const struct EvaluationContext *eval_ctx, Scene *sce); void operator()(Object *ob); private: - struct EvaluationContext *eval_ctx; + const struct EvaluationContext *eval_ctx; Scene *scene; UnitConverter converter; const ExportSettings *export_settings; -- cgit v1.2.3