Fix [#21298] Colour Management: Convert To Float & Use Colour Balance Linearising...
authorMatt Ebb <matt@mke3.net>
Thu, 1 Apr 2010 03:58:20 +0000 (03:58 +0000)
committerMatt Ebb <matt@mke3.net>
Thu, 1 Apr 2010 03:58:20 +0000 (03:58 +0000)
Removed all colour management from sequencer, need better design/plan for this.

source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_draw.c

index 913ec3d..7900873 100644 (file)
@@ -1750,19 +1750,15 @@ static void input_preprocess(Scene *scene, Sequence *seq, TStripElem *se, int cf
 
        if(seq->flag & SEQ_MAKE_FLOAT) {
                if (!se->ibuf->rect_float) {
-                       if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) {
-                               IMB_float_from_rect(se->ibuf);
-                       } else {
-                               int profile = IB_PROFILE_NONE;
-                               
-                               /* no color management:
-                                * don't disturb the existing profiles */
-                               SWAP(int, se->ibuf->profile, profile);
+                       int profile = IB_PROFILE_NONE;
+                       
+                       /* no color management:
+                        * don't disturb the existing profiles */
+                       SWAP(int, se->ibuf->profile, profile);
 
-                               IMB_float_from_rect(se->ibuf);
-                               
-                               SWAP(int, se->ibuf->profile, profile);
-                       }
+                       IMB_float_from_rect(se->ibuf);
+                       
+                       SWAP(int, se->ibuf->profile, profile);
                }
                if (se->ibuf->rect) {
                        imb_freerectImBuf(se->ibuf);
index d725c5c..60927b5 100644 (file)
@@ -754,11 +754,6 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
        }
 
        if(ibuf->rect_float && ibuf->rect==NULL) {
-               if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) {
-                       ibuf->profile = IB_PROFILE_LINEAR_RGB;
-               } else {
-                       ibuf->profile = IB_PROFILE_NONE;
-               }
                IMB_rect_from_float(ibuf);      
        }