[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50128] branches/soc-2011-tomato/source/ blender/imbuf/intern/colormanagement.c: Sequencer: fix sequence color space applying twice when rendering meta strips
Sergey Sharybin
sergey.vfx at gmail.com
Wed Aug 22 18:16:38 CEST 2012
Revision: 50128
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50128
Author: nazgul
Date: 2012-08-22 16:16:38 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Sequencer: fix sequence color space applying twice when rendering meta strips
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c 2012-08-22 15:38:03 UTC (rev 50127)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c 2012-08-22 16:16:38 UTC (rev 50128)
@@ -1086,7 +1086,7 @@
(void) make_float;
if (!ibuf->rect_float) {
- if (make_float) {
+ if (make_float && ibuf->rect) {
/* when converting byte buffer to float in sequencer we need to make float
* buffer be in sequencer's working space, which is currently only doable
* from linear space.
@@ -1112,6 +1112,8 @@
#ifdef WITH_OCIO
if (global_role_sequencer[0]) {
IMB_colormanagement_imbuf_to_role(ibuf, COLOR_ROLE_SEQUENCER);
+
+ ibuf->profile = IB_PROFILE_SRGB;
}
else
#endif
@@ -1128,7 +1130,10 @@
#ifdef WITH_OCIO
if (global_role_sequencer[0]) {
- IMB_colormanagement_imbuf_from_role(ibuf, COLOR_ROLE_SEQUENCER);
+ if (ibuf->profile == IB_PROFILE_SRGB) {
+ IMB_colormanagement_imbuf_from_role(ibuf, COLOR_ROLE_SEQUENCER);
+ ibuf->profile = IB_PROFILE_LINEAR_RGB;
+ }
}
else
#endif
More information about the Bf-blender-cvs
mailing list