[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50233] branches/soc-2011-tomato/source/ blender/blenkernel/intern/seqeffects.c: Sequencer: fix for wrong color space sequencer effects were working in

[Sergey Sharybin]

Revision: 50233
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50233
Author:   nazgul
Date:     2012-08-26 23:57:55 +0000 (Sun, 26 Aug 2012)
Log Message:
-----------
Sequencer: fix for wrong color space sequencer effects were working in

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c	2012-08-26 23:34:38 UTC (rev 50232)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/seqeffects.c	2012-08-26 23:57:55 UTC (rev 50233)
@@ -53,6 +53,7 @@
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
+#include "IMB_colormanagement.h"
 
 #include "RNA_access.h"
 
@@ -120,13 +121,13 @@
 	}
 	
 	if (ibuf1 && !ibuf1->rect_float && out->rect_float) {
-		IMB_float_from_rect_simple(ibuf1);
+		IMB_colormanagement_imbuf_to_sequencer_space(ibuf1, TRUE);
 	}
 	if (ibuf2 && !ibuf2->rect_float && out->rect_float) {
-		IMB_float_from_rect_simple(ibuf2);
+		IMB_colormanagement_imbuf_to_sequencer_space(ibuf2, TRUE);
 	}
 	if (ibuf3 && !ibuf3->rect_float && out->rect_float) {
-		IMB_float_from_rect_simple(ibuf3);
+		IMB_colormanagement_imbuf_to_sequencer_space(ibuf3, TRUE);
 	}
 	
 	if (ibuf1 && !ibuf1->rect && !out->rect_float) {
@@ -138,7 +139,9 @@
 	if (ibuf3 && !ibuf3->rect && !out->rect_float) {
 		IMB_rect_from_float(ibuf3);
 	}
-			
+
+	out->profile = IB_PROFILE_SRGB;
+
 	return out;
 }