diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-03-07 14:51:09 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-03-07 14:51:09 +0300 |
| commit | daff7a447e75a7901b7f3d782839c5a15c16efc1 (patch) | |
| tree | 35ea0f392fc15b436a1081539a38ff73f23e2b2d /source/blender/nodes/intern | |
| parent | c544d3ffb8688a8456d25aa132c1e9aedb1387c5 (diff) | |
Bugfix #26388
Actually a todo item I forgot:
Material nodes previews now follow the scene "color managenent"
setting.
Diffstat (limited to 'source/blender/nodes/intern')
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_material.c b/source/blender/nodes/intern/SHD_nodes/SHD_material.c index a95968e7fc9..317dd07f8fe 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_material.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_material.c @@ -155,7 +155,7 @@ static void node_shader_exec_material(void *data, bNode *node, bNodeStack **in, col[3]= shrnode.alpha; if(shi->do_preview) - nodeAddToPreview(node, col, shi->xs, shi->ys); + nodeAddToPreview(node, col, shi->xs, shi->ys, shi->do_manage); VECCOPY(out[MAT_OUT_COLOR]->vec, col); out[MAT_OUT_ALPHA]->vec[0]= shrnode.alpha; diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_output.c b/source/blender/nodes/intern/SHD_nodes/SHD_output.c index 4b6488cf4e0..e42caabff34 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_output.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_output.c @@ -52,7 +52,7 @@ static void node_shader_exec_output(void *data, bNode *node, bNodeStack **in, bN nodestack_get_vec(col+3, SOCK_VALUE, in[1]); if(shi->do_preview) { - nodeAddToPreview(node, col, shi->xs, shi->ys); + nodeAddToPreview(node, col, shi->xs, shi->ys, shi->do_manage); node->lasty= shi->ys; } diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_texture.c b/source/blender/nodes/intern/SHD_nodes/SHD_texture.c index c2fb18a939b..249e4eeca5d 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_texture.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_texture.c @@ -116,7 +116,7 @@ static void node_shader_exec_texture(void *data, bNode *node, bNodeStack **in, b VECCOPY(out[2]->vec, nor); if(shi->do_preview) - nodeAddToPreview(node, out[1]->vec, shi->xs, shi->ys); + nodeAddToPreview(node, out[1]->vec, shi->xs, shi->ys, shi->do_manage); } } diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c index da047fc9a87..51b3c6d909f 100644 --- a/source/blender/nodes/intern/TEX_util.c +++ b/source/blender/nodes/intern/TEX_util.c @@ -124,7 +124,7 @@ void tex_do_preview(bNode *node, float *co, float *col) int xs= ((co[0] + 1.0f)*0.5f)*preview->xsize; int ys= ((co[1] + 1.0f)*0.5f)*preview->ysize; - nodeAddToPreview(node, col, xs, ys); + nodeAddToPreview(node, col, xs, ys, 0); /* 0 = no color management */ } } |