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

Cleanup: refactor image texture node code for coming changes

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-05-19 02:46:24 +02:00
parent bb8ed813f3
commit 7c78c20b6b
5 changed files with 84 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/kernel/shaders/node_environment_texture.osl
View File

@@ -47,9 +47,10 @@ shader node_environment_texture(
string filename = "",
string projection = "equirectangular",
string interpolation = "linear",
string color_space = "sRGB",
int compress_as_srgb = 0,
int ignore_alpha = 0,
int unassociate_alpha = 0,
int is_float = 1,
int use_alpha = 1,
output color Color = 0.0,
output float Alpha = 1.0)
{
@@ -69,13 +70,16 @@ shader node_environment_texture(
Color = (color)texture(
filename, p[0], 1.0 - p[1], "wrap", "periodic", "interp", interpolation, "alpha", Alpha);
if (use_alpha) {
if (ignore_alpha) {
Alpha = 1.0;
}
else if (unassociate_alpha) {
Color = color_unpremultiply(Color, Alpha);
if (!is_float)
Color = min(Color, 1.0);
}
if (color_space == "sRGB")
if (compress_as_srgb)
Color = color_srgb_to_scene_linear(Color);
}