[Bf-blender-cvs] [c9c8872] master: Sequencer: don't cache frames during proxy rebuild job

[Sergey Sharybin]

Commit: c9c8872da0c94d7954dbcbcedb97ad3b004d2ccc
Author: Sergey Sharybin
Date:   Fri Jan 17 20:03:48 2014 +0600
https://developer.blender.org/rBc9c8872da0c94d7954dbcbcedb97ad3b004d2ccc

Sequencer: don't cache frames during proxy rebuild job

===================================================================

M	source/blender/blenkernel/BKE_sequencer.h
M	source/blender/blenkernel/intern/seqcache.c
M	source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 0ca1d90..c723797 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -98,6 +98,7 @@ typedef struct SeqRenderData {
 	int preview_render_size;
 	int motion_blur_samples;
 	float motion_blur_shutter;
+	bool skip_cache;
 } SeqRenderData;
 
 SeqRenderData BKE_sequencer_new_render_data(struct EvaluationContext *eval_ctx, struct Main *bmain,
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c
index 919d38b..38d3d46 100644
--- a/source/blender/blenkernel/intern/seqcache.c
+++ b/source/blender/blenkernel/intern/seqcache.c
@@ -229,7 +229,7 @@ void BKE_sequencer_cache_put(SeqRenderData context, Sequence *seq, float cfra, s
 {
 	SeqCacheKey key;
 
-	if (!i) {
+	if (i == NULL || context.skip_cache) {
 		return;
 	}
 
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index d1d8800..337d975 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -513,6 +513,7 @@ SeqRenderData BKE_sequencer_new_render_data(EvaluationContext *eval_ctx,
 	rval.motion_blur_samples = 0;
 	rval.motion_blur_shutter = 0;
 	rval.eval_ctx = eval_ctx;
+	rval.skip_cache = false;
 
 	return rval;
 }
@@ -1535,6 +1536,7 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context, short *stop, sho
 	render_context = BKE_sequencer_new_render_data(bmain->eval_ctx, bmain, context->scene,
 	                                    (scene->r.size * (float) scene->r.xsch) / 100.0f + 0.5f,
 	                                    (scene->r.size * (float) scene->r.ysch) / 100.0f + 0.5f, 100);
+	render_context.skip_cache = true;
 
 	for (cfra = seq->startdisp + seq->startstill;  cfra < seq->enddisp - seq->endstill; cfra++) {
 		if (context->size_flags & IMB_PROXY_25) {