diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-17 18:47:58 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-17 18:47:58 +0400 |
commit | cf0e457e524cfc9f496705de6cbf1e41c5118828 (patch) | |
tree | 55008245844f7c617ee5fe6e113a775778acb4b0 /intern/cycles/kernel/shaders/node_environment_texture.osl | |
parent | 0fc4f4b7916aaec09228a54fac16b9618c192f6a (diff) |
Fix #35004: fireflies with .tif image in cycles, try to avoid extreme values when
openimageio can't detect premul/straight alpha correct.
Diffstat (limited to 'intern/cycles/kernel/shaders/node_environment_texture.osl')
-rw-r--r-- | intern/cycles/kernel/shaders/node_environment_texture.osl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index 36b2f755c20..bddef418c3d 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -48,6 +48,7 @@ shader node_environment_texture( string filename = "", string projection = "Equirectangular", string color_space = "sRGB", + int is_float = 1, output color Color = 0.0, output float Alpha = 1.0) { @@ -66,9 +67,13 @@ 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)) + if (isconnected(Alpha)) { Color = color_unpremultiply(Color, Alpha); + if (!is_float) + Color = min(Color, 1.0); + } + if (color_space == "sRGB") Color = color_srgb_to_scene_linear(Color); } |