[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50851] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: Sequencer: movie clip float buffers should be converted to internal sequencer space

[Sergey Sharybin]

Revision: 50851
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50851
Author:   nazgul
Date:     2012-09-24 15:26:59 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
Sequencer: movie clip float buffers should be converted to internal sequencer space

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-09-24 15:26:54 UTC (rev 50850)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-09-24 15:26:59 UTC (rev 50851)
@@ -2585,14 +2585,14 @@
 			ibuf = seq_render_movieclip_strip(context, seq, nr);
 
 			if (ibuf) {
-				if (use_preprocess) {
-					ImBuf *i = IMB_dupImBuf(ibuf);
+				/* duplicate frame so movie cache wouldn't be confused by sequencer's stuff */
+				ImBuf *i = IMB_dupImBuf(ibuf);
+				IMB_freeImBuf(ibuf);
+				ibuf = i;
 
-					IMB_freeImBuf(ibuf);
+				if (ibuf->rect_float)
+					BKE_sequencer_imbuf_to_sequencer_space(context.scene, ibuf, FALSE);
 
-					ibuf = i;
-				}
-
 				copy_to_ibuf_still(context, seq, nr, ibuf);
 			}