diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-09 15:04:49 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-09-09 15:04:49 +0400 |
| commit | c810e417bde1dd81c8218915748b5bc55f926c6e (patch) | |
| tree | fd77bae179bcde7a425b9a86f589c687af94406a /source/blender/nodes | |
| parent | 521c085af80669a021020d3cdd38dfde38018925 (diff) | |
Fix #32513: incorrect color management in Material draw mode for Cycles.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_environment.c | 3 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_image.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c index e857d0571cd..ace0f0c8774 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c @@ -69,6 +69,9 @@ static int node_shader_gpu_tex_environment(GPUMaterial *mat, bNode *node, GPUNod node_shader_gpu_tex_mapping(mat, node, in, out); + if (out[0].link && GPU_material_do_color_management(mat)) + GPU_link(mat, "srgb_to_linearrgb", out[0].link, &out[0].link); + return GPU_stack_link(mat, "node_tex_environment", in, out, GPU_image(ima, iuser, ncd)); } diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c index c492fe9efc7..d6c757222b9 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c @@ -69,6 +69,9 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat, bNode *node, GPUNodeStack node_shader_gpu_tex_mapping(mat, node, in, out); + if (out[0].link && GPU_material_do_color_management(mat)) + GPU_link(mat, "srgb_to_linearrgb", out[0].link, &out[0].link); + return GPU_stack_link(mat, "node_tex_image", in, out, GPU_image(ima, iuser, ncd)); } |