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@gmail.com>2018-05-05 16:09:21 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-05-05 17:01:45 +0300
commit1ddedfb2afd43dd2c2a460a5c13e02f238da3fc0 (patch)
treeae1fc01a26e479a1b3fdaa710caf9c7f41ff3c52 /source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
parent6d980020ba60859947a912e6870c3050a32ab0fd (diff)
3D viewport: rename ambient to shadow intensity, default single color to 0.8.
Diffstat (limited to 'source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl')
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
index bc6125f18b6..f96f5ff0af7 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
@@ -6,7 +6,7 @@ uniform sampler2D normalBuffer;
/* normalBuffer contains viewport normals */
uniform vec2 invertedViewportSize;
uniform vec3 objectOverlapColor = vec3(0.0);
-uniform float lightMultiplier;
+uniform float shadowMultiplier;
layout(std140) uniform world_block {
WorldData world_data;
@@ -49,11 +49,11 @@ void main()
vec3 normal_viewport = texelFetch(normalBuffer, texel, 0).rgb;
#endif /* WORKBENCH_ENCODE_NORMALS */
vec3 diffuse_light = get_world_diffuse_light(world_data, normal_viewport);
- vec3 shaded_color = diffuse_light * diffuse_color.rgb * lightMultiplier;
+ vec3 shaded_color = diffuse_light * diffuse_color.rgb * (1.0 - shadowMultiplier);
#else /* V3D_LIGHTING_STUDIO */
vec3 diffuse_color = texelFetch(colorBuffer, texel, 0).rgb;
- vec3 shaded_color = diffuse_color * lightMultiplier;
+ vec3 shaded_color = diffuse_color * (1.0 - shadowMultiplier);
#endif /* V3D_LIGHTING_STUDIO */