[Bf-blender-cvs] [a0f6da0abc6] master: Revert "Fix T79523 Paint Cursor: Wide line not supported on OSX"

[Clément Foucault]

Commit: a0f6da0abc6fefc6a679d8182b673e7c5ad3fdde
Author: Clément Foucault
Date:   Fri Sep 18 16:22:39 2020 +0200
Branches: master
https://developer.blender.org/rBa0f6da0abc6fefc6a679d8182b673e7c5ad3fdde

Revert "Fix T79523 Paint Cursor: Wide line not supported on OSX"

This commit caused regression on some sculpt paint cursors. A better
approach is being worked on.

This reverts commit 6ade522f277fb74d4691973b7bb55840300043a2.

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

M	source/blender/editors/sculpt_paint/paint_cursor.c

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

diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 7379bdde4ab..55abb269660 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -1839,28 +1839,22 @@ static void paint_cursor_update_anchored_location(PaintCursorContext *pcontext)
 
 static void paint_cursor_setup_2D_drawing(PaintCursorContext *pcontext)
 {
+  GPU_line_width(2.0f);
   GPU_blend(GPU_BLEND_ALPHA);
+  GPU_line_smooth(true);
   pcontext->pos = GPU_vertformat_attr_add(
       immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
-
-  float viewport[4];
-  GPU_viewport_size_get_f(viewport);
-  immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
-  immUniform2fv("viewportSize", &viewport[2]);
-  immUniform1f("lineWidth", 2.0f * U.pixelsize);
+  immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 }
 
 static void paint_cursor_setup_3D_drawing(PaintCursorContext *pcontext)
 {
+  GPU_line_width(2.0f);
   GPU_blend(GPU_BLEND_ALPHA);
+  GPU_line_smooth(true);
   pcontext->pos = GPU_vertformat_attr_add(
       immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
-
-  float viewport[4];
-  GPU_viewport_size_get_f(viewport);
-  immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
-  immUniform2fv("viewportSize", &viewport[2]);
-  immUniform1f("lineWidth", 2.0f * U.pixelsize);
+  immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
 }
 
 static void paint_cursor_restore_drawing_state(void)