From bf1b622dd962416fef94ccb2f47878eced31e20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= <foucault.clem@gmail.com>
Date: Sun, 16 Aug 2020 15:38:34 +0200
Subject: GPUState: GPU_blend final API renaming

We now use GPU_blend for enabling / disabling blending and explicitly
set the blend equation.
---
 source/blender/editors/transform/transform.c                 | 6 +++---
 source/blender/editors/transform/transform_constraints.c     | 2 +-
 source/blender/editors/transform/transform_draw_cursors.c    | 4 ++--
 source/blender/editors/transform/transform_gizmo_3d.c        | 4 ++--
 source/blender/editors/transform/transform_mode_edge_slide.c | 6 +++---
 source/blender/editors/transform/transform_mode_vert_slide.c | 4 ++--
 source/blender/editors/transform/transform_snap.c            | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'source/blender/editors/transform')

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index f760e90c68f..b97145c5f50 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1544,15 +1544,15 @@ static void drawAutoKeyWarning(TransInfo *UNUSED(t), ARegion *region)
 #endif
 
   /* autokey recording icon... */
-  GPU_blend_set_func_separate(GPU_BLEND_ALPHA);
-  GPU_blend(true);
+  GPU_blend(GPU_BLEND_ALPHA);
+  GPU_blend(GPU_BLEND_ALPHA);
 
   xco -= U.widget_unit;
   yco -= (int)printable_size[1] / 2;
 
   UI_icon_draw(xco, yco, ICON_REC);
 
-  GPU_blend(false);
+  GPU_blend(GPU_BLEND_NONE);
 }
 
 static void drawTransformPixel(const struct bContext *C, ARegion *region, void *arg)
diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
index d0e37f22236..0aa6b4f6131 100644
--- a/source/blender/editors/transform/transform_constraints.c
+++ b/source/blender/editors/transform/transform_constraints.c
@@ -884,7 +884,7 @@ void drawPropCircle(const struct bContext *C, TransInfo *t)
 
     float viewport[4];
     GPU_viewport_size_get_f(viewport);
-    GPU_blend(true);
+    GPU_blend(GPU_BLEND_ALPHA);
 
     immUniform2fv("viewportSize", &viewport[2]);
     immUniform1f("lineWidth", 3.0f * U.pixelsize);
diff --git a/source/blender/editors/transform/transform_draw_cursors.c b/source/blender/editors/transform/transform_draw_cursors.c
index 95ca5ae0c30..84fc45e2b45 100644
--- a/source/blender/editors/transform/transform_draw_cursors.c
+++ b/source/blender/editors/transform/transform_draw_cursors.c
@@ -191,7 +191,7 @@ void transform_draw_cursor_draw(bContext *UNUSED(C), int x, int y, void *customd
     }
 
     GPU_line_smooth(true);
-    GPU_blend(true);
+    GPU_blend(GPU_BLEND_ALPHA);
 
     GPU_matrix_push();
 
@@ -339,6 +339,6 @@ void transform_draw_cursor_draw(bContext *UNUSED(C), int x, int y, void *customd
     GPU_matrix_pop();
 
     GPU_line_smooth(false);
-    GPU_blend(false);
+    GPU_blend(GPU_BLEND_NONE);
   }
 }
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index 6155042f555..dffee72205b 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -1344,7 +1344,7 @@ void drawDial3d(const TransInfo *t)
     gizmo_get_axis_color(axis_idx, NULL, color, color);
 
     GPU_depth_test(false);
-    GPU_blend(true);
+    GPU_blend(GPU_BLEND_ALPHA);
     GPU_line_smooth(true);
 
     ED_gizmotypes_dial_3d_draw_util(mat_basis,
@@ -1360,7 +1360,7 @@ void drawDial3d(const TransInfo *t)
 
     GPU_line_smooth(false);
     GPU_depth_test(true);
-    GPU_blend(false);
+    GPU_blend(GPU_BLEND_NONE);
   }
 }
 
diff --git a/source/blender/editors/transform/transform_mode_edge_slide.c b/source/blender/editors/transform/transform_mode_edge_slide.c
index deed5c84d2b..d9fd8880c3f 100644
--- a/source/blender/editors/transform/transform_mode_edge_slide.c
+++ b/source/blender/editors/transform/transform_mode_edge_slide.c
@@ -1149,8 +1149,8 @@ void drawEdgeSlide(TransInfo *t)
 
   GPU_depth_test(false);
 
-  GPU_blend(true);
-  GPU_blend_set_func_separate(GPU_BLEND_ALPHA);
+  GPU_blend(GPU_BLEND_ALPHA);
+  GPU_blend(GPU_BLEND_ALPHA);
 
   GPU_matrix_push();
   GPU_matrix_mul(TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->obmat);
@@ -1265,7 +1265,7 @@ void drawEdgeSlide(TransInfo *t)
 
   GPU_matrix_pop();
 
-  GPU_blend(false);
+  GPU_blend(GPU_BLEND_NONE);
 
   GPU_depth_test(true);
 }
diff --git a/source/blender/editors/transform/transform_mode_vert_slide.c b/source/blender/editors/transform/transform_mode_vert_slide.c
index 9691da6a32f..1de7d219cae 100644
--- a/source/blender/editors/transform/transform_mode_vert_slide.c
+++ b/source/blender/editors/transform/transform_mode_vert_slide.c
@@ -392,8 +392,8 @@ void drawVertSlide(TransInfo *t)
 
       GPU_depth_test(false);
 
-      GPU_blend(true);
-      GPU_blend_set_func_separate(GPU_BLEND_ALPHA);
+      GPU_blend(GPU_BLEND_ALPHA);
+      GPU_blend(GPU_BLEND_ALPHA);
 
       GPU_matrix_push();
       GPU_matrix_mul(TRANS_DATA_CONTAINER_FIRST_OK(t)->obedit->obmat);
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index a700dd320b7..09b5df82c2b 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -245,7 +245,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 
       size = 2.5f * UI_GetThemeValuef(TH_VERTEX_SIZE);
 
-      GPU_blend(true);
+      GPU_blend(GPU_BLEND_ALPHA);
 
       uint pos = GPU_vertformat_attr_add(
           immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
@@ -271,7 +271,7 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
 
       immUnbindProgram();
 
-      GPU_blend(false);
+      GPU_blend(GPU_BLEND_NONE);
     }
   }
 }
-- 
cgit v1.2.3