[Bf-blender-cvs] [9869e4ffe5e] blender2.8: Fix T56992 caused by typo in previous fix
Clément Foucault
noreply at git.blender.org
Thu Oct 4 14:58:34 CEST 2018
Commit: 9869e4ffe5e6d1aa265cc09ef9ae3f3538ab59f0
Author: Clément Foucault
Date: Thu Oct 4 14:56:51 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9869e4ffe5e6d1aa265cc09ef9ae3f3538ab59f0
Fix T56992 caused by typo in previous fix
===================================================================
M source/blender/draw/engines/workbench/shaders/workbench_deferred_composite_frag.glsl
===================================================================
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);
}
More information about the Bf-blender-cvs
mailing list