[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50118] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: Sequencer: fix for incorrect proxies rendering after some recent refactor

Sergey Sharybin sergey.vfx at gmail.com
Wed Aug 22 15:45:20 CEST 2012


Revision: 50118
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50118
Author:   nazgul
Date:     2012-08-22 13:45:20 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Sequencer: fix for incorrect proxies rendering after some recent refactor

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-22 13:34:06 UTC (rev 50117)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-08-22 13:45:20 UTC (rev 50118)
@@ -2565,7 +2565,8 @@
 				is_proxy_image = (ibuf != NULL);
 			}
 
-			ibuf = do_render_strip_uncached(context, seq, cfra);
+			if (ibuf == NULL)
+				ibuf = do_render_strip_uncached(context, seq, cfra);
 
 			if (ibuf)
 				BKE_sequencer_preprocessed_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf);




More information about the Bf-blender-cvs mailing list