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 /intern/itasc/MovingFrame.hpp | |
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 'intern/itasc/MovingFrame.hpp')
-rw-r--r-- | intern/itasc/MovingFrame.hpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/intern/itasc/MovingFrame.hpp b/intern/itasc/MovingFrame.hpp index 89519832840..719e06b4bf7 100644 --- a/intern/itasc/MovingFrame.hpp +++ b/intern/itasc/MovingFrame.hpp @@ -15,7 +15,12 @@ struct EvaluationContext; namespace iTaSC{ -typedef bool (*MovingFrameCallback)(struct EvaluationContext *eval_ctx, const Timestamp& timestamp, const Frame& _current, Frame& _next, void *param); +typedef bool (*MovingFrameCallback)( + const struct EvaluationContext *eval_ctx, + const Timestamp& timestamp, + const Frame& _current, + Frame& _next, + void *param); class MovingFrame: public UncontrolledObject { public: @@ -25,7 +30,7 @@ public: bool setFrame(const Frame& frame); bool setCallback(MovingFrameCallback _function, void* _param); - virtual void updateCoordinates(struct EvaluationContext *eval_ctx, const Timestamp& timestamp); + virtual void updateCoordinates(const struct EvaluationContext *eval_ctx, const Timestamp& timestamp); virtual void updateKinematics(const Timestamp& timestamp); virtual void pushCache(const Timestamp& timestamp); virtual void initCache(Cache *_cache); |