From 39cad75dcb5401cb66969402ef680b76cb8b3146 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 24 Feb 2014 20:18:51 +0100 Subject: Fix T38813: missing color management in texture nodes preview. --- source/blender/nodes/texture/node_texture_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/nodes/texture/node_texture_util.c') diff --git a/source/blender/nodes/texture/node_texture_util.c b/source/blender/nodes/texture/node_texture_util.c index a8117b7b333..e01b7ec49f1 100644 --- a/source/blender/nodes/texture/node_texture_util.c +++ b/source/blender/nodes/texture/node_texture_util.c @@ -70,7 +70,7 @@ static void tex_call_delegate(TexDelegate *dg, float *out, TexParams *params, sh dg->fn(out, params, dg->node, dg->in, thread); if (dg->cdata->do_preview) - tex_do_preview(dg->preview, params->previewco, out); + tex_do_preview(dg->preview, params->previewco, out, dg->cdata->do_manage); } } @@ -127,13 +127,13 @@ void params_from_cdata(TexParams *out, TexCallData *in) out->mtex = in->mtex; } -void tex_do_preview(bNodePreview *preview, const float coord[2], const float col[4]) +void tex_do_preview(bNodePreview *preview, const float coord[2], const float col[4], bool do_manage) { if (preview) { int xs = ((coord[0] + 1.0f) * 0.5f) * preview->xsize; int ys = ((coord[1] + 1.0f) * 0.5f) * preview->ysize; - BKE_node_preview_set_pixel(preview, col, xs, ys, 0); /* 0 = no color management */ + BKE_node_preview_set_pixel(preview, col, xs, ys, do_manage); } } -- cgit v1.2.3