From cf0e457e524cfc9f496705de6cbf1e41c5118828 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 17 Apr 2013 14:47:58 +0000 Subject: Fix #35004: fireflies with .tif image in cycles, try to avoid extreme values when openimageio can't detect premul/straight alpha correct. --- intern/cycles/kernel/shaders/node_environment_texture.osl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'intern/cycles/kernel/shaders/node_environment_texture.osl') 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); } -- cgit v1.2.3