[Bf-blender-cvs] [f27389c] gooseberry: Better implementation for cache disable - do not store or retrieve cache ever if debug value is 314

[Antony Riakiotakis]

Commit: f27389cd01ed1c5727240590a39861fe1ad49a0c
Author: Antony Riakiotakis
Date:   Wed Feb 4 13:56:57 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBf27389cd01ed1c5727240590a39861fe1ad49a0c

Better implementation for cache disable - do not store or retrieve cache
ever if debug value is 314

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

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

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

diff --git a/source/blender/blenkernel/intern/seqcache.c 
b/source/blender/blenkernel/intern/seqcache.c
index a1135bfc..fd03186 100644
--- a/source/blender/blenkernel/intern/seqcache.c
+++ b/source/blender/blenkernel/intern/seqcache.c
@@ -29,6 +29,7 @@
 #include <stddef.h>
 
 #include "BLI_sys_types.h"  /* for intptr_t */
+#include "BKE_global.h"
 
 #include "MEM_guardedalloc.h"
 
@@ -168,7 +169,7 @@ void BKE_sequencer_cache_put(const SeqRenderData *context, 
Sequence *seq, float
 {
        SeqCacheKey key;
 
-       if (i == NULL || context->skip_cache) {
+       if (i == NULL || context->skip_cache || G.debug_value == 314) {
                return;
        }
 
@@ -214,7 +215,7 @@ ImBuf *BKE_sequencer_preprocessed_cache_get(const 
SeqRenderData *context, Sequen
 {
        SeqPreprocessCacheElem *elem;
 
-       if (!preprocess_cache)
+       if (!preprocess_cache || G.debug_value == 314)
                return NULL;
 
        if (preprocess_cache->cfra != cfra)
diff --git a/source/blender/blenkernel/intern/sequencer.c 
b/source/blender/blenkernel/intern/sequencer.c
index d3977a6..ab6883f 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2935,8 +2935,7 @@ static ImBuf *seq_render_strip(const SeqRenderData 
*context, Sequence *seq, floa
 
                if (ibuf == NULL) {
                        /* disable caching in that case */
-                       if (G.debug_value != 314)
-                               ibuf = 
BKE_sequencer_preprocessed_cache_get(context, seq, cfra, SEQ_STRIPELEM_IBUF);
+                       ibuf = BKE_sequencer_preprocessed_cache_get(context, 
seq, cfra, SEQ_STRIPELEM_IBUF);
 
                        if (ibuf == NULL) {
                                /* MOVIECLIPs have their own proxy management */
@@ -2981,7 +2980,8 @@ static ImBuf *seq_render_strip(const SeqRenderData 
*context, Sequence *seq, floa
        if (use_preprocess)
                ibuf = input_preprocess(context, seq, cfra, ibuf, 
is_proxy_image, is_preprocessed);
 
-       BKE_sequencer_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf);
+       if (G.debug_value != 314)
+               BKE_sequencer_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, 
ibuf);
 
        return ibuf;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs