[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27915] trunk/blender/source/blender: Fix [#21298] Colour Management: Convert To Float & Use Colour Balance Linearising VSE Strip
Matt Ebb
matt at mke3.net
Thu Apr 1 05:58:24 CEST 2010
Revision: 27915
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27915
Author: broken
Date: 2010-04-01 05:58:20 +0200 (Thu, 01 Apr 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-04-01 02:28:08 UTC (rev 27914)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2010-04-01 03:58:20 UTC (rev 27915)
@@ -1750,19 +1750,15 @@
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);
Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2010-04-01 02:28:08 UTC (rev 27914)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c 2010-04-01 03:58:20 UTC (rev 27915)
@@ -754,11 +754,6 @@
}
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);
}
More information about the Bf-blender-cvs
mailing list