Merge branch '28' into custom-manipulatorscustom-manipulators

1 files changed, 17 insertions, 1 deletions

diff --git a/source/blender/draw/modes/shaders/object_outline_resolve_frag.glsl b/source/blender/draw/modes/shaders/object_outline_resolve_frag.glsl
index 3937828eca2..964ebe72e81 100644
--- a/source/blender/draw/modes/shaders/object_outline_resolve_frag.glsl
+++ b/source/blender/draw/modes/shaders/object_outline_resolve_frag.glsl
@@ -4,8 +4,24 @@ in vec4 uvcoordsvar;
 out vec4 FragColor;
 
 uniform sampler2D outlineBluredColor;
+uniform vec2 rcpDimensions;
 
 void main()
 {
-	FragColor = texture(outlineBluredColor, uvcoordsvar.st).rgba;
+#ifdef USE_FXAA
+    float aa_alpha = FxaaPixelShader(
+        uvcoordsvar.st,
+        outlineBluredColor,
+        rcpDimensions,
+        1.0,
+        0.166,
+        0.0833
+    ).r;
+#endif
+
+    FragColor = texture(outlineBluredColor, uvcoordsvar.st).rgba;
+
+#ifdef USE_FXAA
+    FragColor.a = aa_alpha;
+#endif
 }