From db421408ce3eb21be3e04cae3e1c987e9b747311 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 24 Mar 2011 14:31:58 +0000 Subject: Bugfix #26584 - Colormanagement code was gamma correcting non-RGBA buffers in composite. (Like vector buffers). - Crash on using "use Color Management" button during composites, because it was freeing all node images. Added code to stop first jobs before freeing. It sends notifier for recomposites after free anyway. --- source/blender/nodes/intern/CMP_nodes/CMP_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/nodes/intern/CMP_nodes') diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_image.c b/source/blender/nodes/intern/CMP_nodes/CMP_image.c index a7be5ac6f8a..1ea3cf96ad0 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_image.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_image.c @@ -80,9 +80,9 @@ static CompBuf *node_composit_get_image(RenderData *rd, Image *ima, ImageUser *i IMB_float_from_rect(ibuf); } - /* now we need a float buffer from the image - * with matching color management */ - if(ibuf->channels == 4) { + /* now we need a float buffer from the image with matching color management */ + /* XXX weak code, multilayer is excluded from this */ + if(ibuf->channels == 4 && ima->rr==NULL) { if(rd->color_mgt_flag & R_COLOR_MANAGEMENT) { if(ibuf->profile != IB_PROFILE_NONE) { rect= ibuf->rect_float; -- cgit v1.2.3