blender
/
blender
131
398
Fork 577
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Complement fixup for 4a1feaa555 (texture shaders) 

We now multiply the alpha by the image alpha (as per severin
suggestion).
That still doesn't solve the main question of user preference drawing
black.
This commit is contained in:
Dalai Felinto 2016-09-28 19:02:53 +00:00
parent 4c7ff8fb1e
commit 9bac74c27b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/gpu/shaders/gpu_shader_2D_texture_2D_frag.glsl
View File

@ -11,5 +11,6 @@ uniform sampler2D texture_map;
void main()
{
fragColor = vec4(texture2D(texture_map, texture_coord).rgb, alpha);
fragColor = texture2D(texture_map, texture_coord)
fragColor.a *= alpha;
}

3
source/blender/gpu/shaders/gpu_shader_2D_texture_rect_frag.glsl
View File

@ -11,5 +11,6 @@ uniform sampler2DRect texture_map;
void main()
{
fragColor = vec4(texture2DRect(texture_map, texture_coord).rgb, alpha);
fragColor = texture2DRect(texture_map, texture_coord);
fragColor.a *= alpha;
}