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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-24 19:05:43 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-04-24 19:05:43 +0400
commitf9592e9a6ecbde45c769d543887541398fbfbda2 (patch)
tree0f0edb2811f76bdfa24a05c88f7902024196b72f /source/blender/gpu/shaders
parenta4f40416f50bc2de49fa027950e33abc73d9d3c3 (diff)
Fix #35063: GLSL texture node Value output was not outputting alpha.
Diffstat (limited to 'source/blender/gpu/shaders')
-rw-r--r--source/blender/gpu/shaders/gpu_shader_material.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 08747b19df2..d9f5d99f950 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -753,7 +753,7 @@ void texture_wood_sin(vec3 vec, out float value, out vec4 color, out vec3 normal
void texture_image(vec3 vec, sampler2D ima, out float value, out vec4 color, out vec3 normal)
{
color = texture2D(ima, (vec.xy + vec2(1.0, 1.0))*0.5);
- value = 1.0;
+ value = color.a;
normal.x = 2.0*(color.r - 0.5);
normal.y = 2.0*(0.5 - color.g);