diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-24 23:18:51 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-24 23:18:51 +0400 |
| commit | 39cad75dcb5401cb66969402ef680b76cb8b3146 (patch) | |
| tree | b816cb206682b9ad8088f1a549f009b67f6a0415 /source/blender/nodes/texture/node_texture_util.c | |
| parent | 0f96d0552dc4cc295d315228a27b0daa593f4a8d (diff) | |
Fix T38813: missing color management in texture nodes preview.
Diffstat (limited to 'source/blender/nodes/texture/node_texture_util.c')
| -rw-r--r-- | source/blender/nodes/texture/node_texture_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } } |