diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-05 20:43:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-05 20:43:53 +0400 |
| commit | 3863e72c735af5a0fbf07cfe6d5f15dbc46d9850 (patch) | |
| tree | b459279e0fad7231c1c166ba5a888494d4d77838 /intern/cycles/kernel/shaders/node_environment_texture.osl | |
| parent | eb11b590a8d5c2152b0f811fc2240aba2e76f6de (diff) | |
Fix #34679: cycles image texture alpha fringes. New rule is now that color output
will not give straight RGB values if the alpha output is used, so that mixing with
a transparent BSDF gives the correct result.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_environment_texture.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_environment_texture.osl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index 33b30a27ee1..36b2f755c20 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -66,6 +66,9 @@ shader node_environment_texture( /* todo: use environment for better texture filtering of equirectangular */ Color = (color)texture(filename, p[0], 1.0 - p[1], "wrap", "periodic", "alpha", Alpha); + if (isconnected(Alpha)) + Color = color_unpremultiply(Color, Alpha); + if (color_space == "sRGB") Color = color_srgb_to_scene_linear(Color); } |