[Bf-blender-cvs] [92103aa8a49] uvimage-editor-drawing: Removed references to OVERLAY2D in defines

[Jeroen Bakker]

Commit: 92103aa8a496cd29ba0a8d847cb08fb462feac0c
Author: Jeroen Bakker
Date:   Thu Aug 20 11:35:20 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB92103aa8a496cd29ba0a8d847cb08fb462feac0c

Removed references to OVERLAY2D in defines

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

M	source/blender/draw/engines/overlay/shaders/common_overlay_lib.glsl
M	source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
M	source/blender/draw/engines/overlay/shaders/edit_uv_edges_geom.glsl

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

diff --git a/source/blender/draw/engines/overlay/shaders/common_overlay_lib.glsl b/source/blender/draw/engines/overlay/shaders/common_overlay_lib.glsl
index c6ad524b9db..65aeb81a4ef 100644
--- a/source/blender/draw/engines/overlay/shaders/common_overlay_lib.glsl
+++ b/source/blender/draw/engines/overlay/shaders/common_overlay_lib.glsl
@@ -1,5 +1,5 @@
-#define OVERLAY2D_LINE_STYLE_OUTLINE 0
-#define OVERLAY2D_LINE_STYLE_DASH 1
-#define OVERLAY2D_LINE_STYLE_BLACK 2
-#define OVERLAY2D_LINE_STYLE_WHITE 3
-#define OVERLAY2D_LINE_STYLE_SHADOW 4
+#define OVERLAY_UV_LINE_STYLE_OUTLINE 0
+#define OVERLAY_UV_LINE_STYLE_DASH 1
+#define OVERLAY_UV_LINE_STYLE_BLACK 2
+#define OVERLAY_UV_LINE_STYLE_WHITE 3
+#define OVERLAY_UV_LINE_STYLE_SHADOW 4
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
index 9469760f45f..ca0d2f66bec 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_frag.glsl
@@ -34,25 +34,25 @@ void main()
   vec2 dd = fwidth(stipplePos_f);
   float line_distance = distance(stipplePos_f, stippleStart_f) / max(dd.x, dd.y);
 
-  if (lineStyle == OVERLAY2D_LINE_STYLE_OUTLINE) {
+  if (lineStyle == OVERLAY_UV_LINE_STYLE_OUTLINE) {
     vec4 base_color = vec4(1.0);
     inner_color = mix(base_color, colorEdgeSelect, selectionFac_f);
     outer_color = vec4(vec3(0.0), 1.0);
   }
-  else if (lineStyle == OVERLAY2D_LINE_STYLE_DASH) {
+  else if (lineStyle == OVERLAY_UV_LINE_STYLE_DASH) {
     if (fract(line_distance / dashLength) < 0.5) {
       inner_color = mix(vec4(1.0), colorEdgeSelect, selectionFac_f);
     }
   }
-  else if (lineStyle == OVERLAY2D_LINE_STYLE_BLACK) {
+  else if (lineStyle == OVERLAY_UV_LINE_STYLE_BLACK) {
     vec4 base_color = vec4(vec3(0.0), 1.0);
     inner_color = mix(base_color, colorEdgeSelect, selectionFac_f);
   }
-  else if (lineStyle == OVERLAY2D_LINE_STYLE_WHITE) {
+  else if (lineStyle == OVERLAY_UV_LINE_STYLE_WHITE) {
     vec4 base_color = vec4(1.0);
     inner_color = mix(base_color, colorEdgeSelect, selectionFac_f);
   }
-  else if (lineStyle == OVERLAY2D_LINE_STYLE_SHADOW) {
+  else if (lineStyle == OVERLAY_UV_LINE_STYLE_SHADOW) {
     inner_color = colorUVShadow;
   }
 
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_geom.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_geom.glsl
index 83cfd0291b5..b948d473335 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_edges_geom.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_edges_geom.glsl
@@ -40,7 +40,7 @@ void main()
 
   float half_size = sizeEdge;
   /* Enlarge edge for outline drawing. */
-  half_size += (lineStyle == OVERLAY2D_LINE_STYLE_OUTLINE) ? max(sizeEdge, 1.0) : 0.0;
+  half_size += (lineStyle == OVERLAY_UV_LINE_STYLE_OUTLINE) ? max(sizeEdge, 1.0) : 0.0;
   /* Add 1 px for AA */
   if (doSmoothWire) {
     half_size += 0.5;