Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-01-25 16:02:59 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-01-25 16:02:59 +0300
commitced20b74e58f3dd33840f2a62f6f1f19714b35d7 (patch)
tree5f97a618b28c9a88635d511178d63c59d8fcc186 /intern/cycles/blender
parente29a6f739de36f4d33cd37181a946345bd26503d (diff)
Fix T50032: Wrong render result when same image is used with and without alpha
Diffstat (limited to 'intern/cycles/blender')
-rw-r--r--intern/cycles/blender/blender_shader.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index f63f94ab37a..f6ec015e1b8 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -640,7 +640,8 @@ static ShaderNode *add_node(Scene *scene,
image->filename.string(),
image->builtin_data,
get_image_interpolation(b_image_node),
- get_image_extension(b_image_node));
+ get_image_extension(b_image_node),
+ image->use_alpha);
}
}
image->color_space = (NodeImageColorSpace)b_image_node.color_space();
@@ -686,7 +687,8 @@ static ShaderNode *add_node(Scene *scene,
env->filename.string(),
env->builtin_data,
get_image_interpolation(b_env_node),
- EXTENSION_REPEAT);
+ EXTENSION_REPEAT,
+ env->use_alpha);
}
}
env->color_space = (NodeImageColorSpace)b_env_node.color_space();
@@ -823,7 +825,8 @@ static ShaderNode *add_node(Scene *scene,
point_density->filename.string(),
point_density->builtin_data,
point_density->interpolation,
- EXTENSION_CLIP);
+ EXTENSION_CLIP,
+ true);
}
node = point_density;