diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-01-22 23:16:00 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-01-22 23:16:00 +0300 |
| commit | 181424152611aa7d842ece0265fb6c630c7a4d77 (patch) | |
| tree | 9a592b9f8349195ab93a2f722acf63d01289a265 /source/blender/gpu | |
| parent | cdaed4d360e77f20c51e21a7b3fc800c3ca92afc (diff) | |
| parent | ce8889175a553967583a1152e71b4390a240a112 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/space_action/action_draw.c
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 2 |
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 4416b6494f9..aa583c5ecf8 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -1358,7 +1358,7 @@ void mtex_cube_map_refl_from_refldir( samplerCube ima, vec3 reflecteddirection, out float value, out vec4 color) { color = textureCube(ima, reflecteddirection); - value = 1.0; + value = color.a; } void mtex_cube_map_refl( |