diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 12:48:20 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 12:48:20 +0300 |
commit | d8da33d21c2fa6035e7dafbea66880d3f3c84cea (patch) | |
tree | bda16c5634275031f2a78c574b5839ff6ba81eb8 /source/blender/blenkernel | |
parent | 7771e0b4748f184c1bb8eb7dd6a1a3a621bcf710 (diff) | |
parent | 6ec8344243e6935281120a504b5a3355d2b3620a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_movieclip.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index 3ddf75f204e..0bdff3eb795 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -32,6 +32,7 @@ * \author Sergey Sharybin */ +struct EvaluationContext; struct ImBuf; struct Main; struct MovieClip; @@ -82,6 +83,9 @@ struct ImBuf *BKE_movieclip_anim_ibuf_for_frame(struct MovieClip *clip, struct M bool BKE_movieclip_has_cached_frame(struct MovieClip *clip, struct MovieClipUser *user); bool BKE_movieclip_put_frame_if_possible(struct MovieClip *clip, struct MovieClipUser *user, struct ImBuf *ibuf); +/* Evaluaiton. */ +void BKE_movieclip_eval_update(struct EvaluationContext *eval_ctx, struct MovieClip *clip); + /* cacheing flags */ #define MOVIECLIP_CACHE_SKIP (1 << 0) diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 16d597e25fa..db05939b1cc 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -77,6 +77,8 @@ # include "intern/openexr/openexr_multi.h" #endif +#define DEBUG_PRINT if (G.debug & G_DEBUG_DEPSGRAPH) printf + /*********************** movieclip buffer loaders *************************/ static int sequence_guess_offset(const char *full_name, int head_len, unsigned short numlen) @@ -1589,3 +1591,9 @@ bool BKE_movieclip_put_frame_if_possible(MovieClip *clip, return result; } + +void BKE_movieclip_eval_update(struct EvaluationContext *UNUSED(eval_ctx), MovieClip *clip) +{ + DEBUG_PRINT("%s on %s (%p)\n", __func__, clip->id.name, clip); + BKE_tracking_dopesheet_tag_update(&clip->tracking); +} |