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
path: root/source
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-10-04 15:56:51 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-10-04 15:56:51 +0300
commit9869e4ffe5e6d1aa265cc09ef9ae3f3538ab59f0 (patch)
treefaea24da01a2b6665edb3cf3a83005748b0112fb /source
parent6bd60292da7769adb4b0cd6a22af1b16bd071af6 (diff)
Fix T56992 caused by typo in previous fix
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl
index a5e81526216..508aeb1f0c1 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl
@@ -45,8 +45,8 @@ void main()
}
else {
/* Do correct alpha blending. */
- vec4 background_color = vec4(background, 1.0);
- vec4 outline_color = vec4(world_data.object_outline_color.rgb, 1.0) * world_data.background_alpha;
+ vec4 background_color = vec4(background, 1.0) * world_data.background_alpha;
+ vec4 outline_color = vec4(world_data.object_outline_color.rgb, 1.0);
fragColor = mix(outline_color, background_color, object_outline);
fragColor = vec4(fragColor.rgb / max(1e-8, fragColor.a), fragColor.a);
}