diff options
author | Matt Ebb <matt@mke3.net> | 2010-04-01 07:58:20 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-04-01 07:58:20 +0400 |
commit | ceebd182ed2e3310d6b65fa73574b941156aa1b0 (patch) | |
tree | 5b1cf8241e5b1da8507a62c16488cea99b10214a /source/blender | |
parent | f49a82b03ebf63f8416b238cf32f29382bc331c9 (diff) |
Fix [#21298] Colour Management: Convert To Float & Use Colour Balance Linearising VSE Strip
Removed all colour management from sequencer, need better design/plan for this.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 20 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 5 |
2 files changed, 8 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 913ec3d4cae..790087334c6 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -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); diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index d725c5c81b4..60927b5f3dd 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -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); } |