Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #35812: cycles image texture node not doing proper alpha handling of PNG

Browse Source 
images with open shading language enabled.
This commit is contained in:
Brecht Van Lommel
2013-06-21 13:05:10 +00:00
parent 2e3035dd80
commit 86c7bf7331
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/shaders/node_image_texture.osl
View File

@@ -30,8 +30,9 @@ color image_texture_lookup(string filename, string color_space, float u, float v
rgb = min(rgb, 1.0);
}
if (color_space == "sRGB")
if (color_space == "sRGB") {
rgb = color_srgb_to_scene_linear(rgb);
}
return rgb;
}
@@ -45,6 +46,7 @@ shader node_image_texture(
string projection = "Flat",
float projection_blend = 0.0,
int is_float = 1,
int use_alpha = 1,
output color Color = 0.0,
output float Alpha = 1.0)
{
@@ -53,8 +55,6 @@ shader node_image_texture(
if (use_mapping)
p = transform(mapping, p);
int use_alpha = isconnected(Alpha);
if (projection == "Flat") {
Color = image_texture_lookup(filename, color_space, p[0], p[1], Alpha, use_alpha, is_float);
}