diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
commit | 788c75ed879fb25a35c0a0e9245df7aeaae2f4ab (patch) | |
tree | 3b1c315078e257e0401904860f9ec90fe60390ee /source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl | |
parent | 1ffd9714b930dbef8059403d69650476f625f554 (diff) | |
parent | 45f833c21dcfad4d1d7045987bb8b69d6aab05be (diff) |
Merge branch 'master' into viewport_bvh_selectviewport_bvh_select
Diffstat (limited to 'source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl')
-rw-r--r-- | source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl b/source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl index 4d1feb5c83e..fd790009e02 100644 --- a/source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_smoke_frag.glsl @@ -8,11 +8,6 @@ uniform float density_scale; uniform sampler3D soot_texture; uniform sampler3D shadow_texture; -#ifdef USE_FIRE -uniform sampler3D flame_texture; -uniform sampler1D spectrum_texture; -#endif - void main() { /* compute color and density from volume texture */ @@ -37,12 +32,5 @@ void main() /* premultiply alpha */ vec4 color = vec4(soot_alpha * soot_color, soot_alpha); -#ifdef USE_FIRE - /* fire */ - float flame = texture3D(flame_texture, coords).r; - vec4 emission = texture1D(spectrum_texture, flame); - color.rgb += (1 - color.a) * emission.a * emission.rgb; -#endif - gl_FragColor = color; } |