diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 17:05:10 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 17:05:10 +0400 |
| commit | 86c7bf733124b2959c4586e2e315e6a4ad53f725 (patch) | |
| tree | 5eebb046c5ac600e32898f6a2a10273e548b5879 /intern/cycles/kernel/shaders/node_environment_texture.osl | |
| parent | 2e3035dd80ff3c69c38195f10c0ab9efdd6ed3ec (diff) | |
Fix #35812: cycles image texture node not doing proper alpha handling of PNG
images with open shading language enabled.
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, 2 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_environment_texture.osl b/intern/cycles/kernel/shaders/node_environment_texture.osl index bddef418c3d..230116d3d77 100644 --- a/intern/cycles/kernel/shaders/node_environment_texture.osl +++ b/intern/cycles/kernel/shaders/node_environment_texture.osl @@ -49,6 +49,7 @@ shader node_environment_texture( string projection = "Equirectangular", string color_space = "sRGB", int is_float = 1, + int use_alpha = 1, output color Color = 0.0, output float Alpha = 1.0) { @@ -67,7 +68,7 @@ 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 (use_alpha) { Color = color_unpremultiply(Color, Alpha); if (!is_float) |