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:
authorJeroen Bakker <j.bakker@atmind.nl>2018-05-30 21:34:29 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-05-30 21:34:29 +0300
commitf5f25b843ee0edd559187abcfaf4fefbf1901d86 (patch)
tree4403ffa0d00b47c1e106f1c7c1813c71cd441586 /source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl
parenteb0fcd4574aaac732045058dce71a17f6900384c (diff)
Removed Object color from workbench. Added Highlights to FLAT shading.
Diffstat (limited to 'source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl')
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl
index 6585bac9289..d0e3305cc70 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl
@@ -41,7 +41,15 @@ void main()
vec3 shaded_color = diffuse_light * diffuse_color.rgb + specular_color;
#else /* V3D_LIGHTING_STUDIO */
+ #ifdef V3D_SHADING_SPECULAR_HIGHLIGHT
+ vec3 specular_color = get_world_specular_light(world_data, normal_viewport, vec3(0.0, 0.0, 1.0));
+ vec3 shaded_color = diffuse_color.rgb + specular_color;
+
+ #else /* V3D_SHADING_SPECULAR_HIGHLIGHT */
vec3 shaded_color = diffuse_color.rgb;
+
+ #endif /* V3D_SHADING_SPECULAR_HIGHLIGHT */
+
#endif /* V3D_LIGHTING_STUDIO */
float alpha = 0.5 ;