[Bf-blender-cvs] [76e7528] gooseberry: Comment out the proxy fix to test if it makes things better,

Antony Riakiotakis noreply at git.blender.org
Thu Jan 29 14:40:56 CET 2015


Commit: 76e7528cb18c10a039c5438ac1b6d5e3b464a8cb
Author: Antony Riakiotakis
Date:   Thu Jan 29 14:38:50 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB76e7528cb18c10a039c5438ac1b6d5e3b464a8cb

Comment out the proxy fix to test if it makes things better,

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

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

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 6cb3577..70a09c2 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2856,16 +2856,16 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s
 				                         seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
 				                         proxy_size);
 
-				/* fetching for requested proxy size failed, try fetching the original instead */
+				/* fetching for requested proxy size failed, try fetching the original instead 
 				if (!ibuf && proxy_size != IMB_PROXY_NONE) {
 					IMB_Proxy_Size proxy_sizes = IMB_anim_proxy_get_existing(seq->anim);
 					while (!(proxy_size & proxy_sizes) && proxy_size > 0) {
-						proxy_size <<= 1;
+						proxy_size >>= 1;
 					}
 					ibuf = IMB_anim_absolute(seq->anim, nr + seq->anim_startofs,
 					                         seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
 					                         proxy_size);
-				}
+				}*/
 				if (ibuf) {
 					BKE_sequencer_imbuf_to_sequencer_space(context->scene, ibuf, false);




More information about the Bf-blender-cvs mailing list