[Bf-blender-cvs] [d13a685d1c9] greasepencil-object: Revert antialiasing commit

[Antonio Vazquez]

Commit: d13a685d1c93ebb0bf9a716d9b21b62a95d1a3f7
Author: Antonio Vazquez
Date:   Sat Apr 7 11:37:45 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd13a685d1c93ebb0bf9a716d9b21b62a95d1a3f7

Revert antialiasing commit

The antialiasing was not working because the final image in default framebuffer is not used to calculate the AA pixels, so this double antialiasing was only adding drawing time.

We need to find a way to mix the grease pencil with the current default framebuffer with antialiasing.

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_engine.c

===================================================================

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 1f1001f3965..3e82c99ce14 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -807,7 +807,6 @@ static void GPENCIL_draw_scene(void *vedata)
 				/* Combine with scene buffer */
 				if ((!is_render) || (fbl->main == NULL)) {
 					GPU_framebuffer_bind(dfbl->default_fb);
-					MULTISAMPLE_SYNC_ENABLE(dfbl);
 				}
 				else {
 					GPU_framebuffer_bind(fbl->main);
@@ -817,10 +816,6 @@ static void GPENCIL_draw_scene(void *vedata)
 
 				DRW_draw_pass(psl->mix_pass);
 
-				if ((!is_render) || (fbl->main == NULL)) {
-					MULTISAMPLE_SYNC_DISABLE(dfbl);
-				}
-
 				/* prepare for fast drawing */
 				if (!is_render) {
 					gpencil_prepare_fast_drawing(stl, dfbl, fbl, psl->mix_pass_noblend, clearcol);