Revision: 24031
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24031
Author: broken
Date: 2009-10-21 02:33:08 +0200 (Wed, 21 Oct 2009)
Log Message:
-----------
* fix for colour management, compositor image node wasn't working correctly.
There are a few other issues around here I need to get to eventually as well..
Modified Paths:
--------------
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
2009-10-20 23:51:31 UTC (rev 24030)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
2009-10-21 00:33:08 UTC (rev 24031)
@@ -67,11 +67,15 @@
if (rd->color_mgt_flag & R_COLOR_MANAGEMENT) {
if (ibuf->profile == IB_PROFILE_NONE) {
- if (ibuf->rect_float != NULL) {
+ /* if float buffer already exists = already linear */
+ /* else ... */
+ if (ibuf->rect_float == NULL) {
imb_freerectfloatImBuf(ibuf);
+ ibuf->profile = IB_PROFILE_SRGB;
+ IMB_float_from_rect(ibuf);
+ } else {
+ ibuf->profile = IB_PROFILE_LINEAR_RGB;
}
- ibuf->profile = IB_PROFILE_SRGB;
- IMB_float_from_rect(ibuf);
}
} else {
if (ibuf->profile == IB_PROFILE_SRGB) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
