griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix [#21298] Colour Management: Convert To Float & Use Colour Balance Linearising VSE Strip

Browse Source 
Removed all colour management from sequencer, need better design/plan for this.
This commit is contained in:
Matt Ebb
2010-04-01 03:58:20 +00:00
parent f49a82b03e
commit ceebd182ed
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/sequencer.c
View 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);

5
source/blender/editors/space_sequencer/sequencer_draw.c
View 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);
}