Merge branch 'blender2.8' into temp-tab_drag_droptemp-tab_drag_drop

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_width_geom.glsl b/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_width_geom.glsl
index 20c72f4407d..5a4da5cc9d4 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_width_geom.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_line_dashed_width_geom.glsl
@@ -10,7 +10,7 @@ uniform float width;  /* in pixels, screen space. */
 
 /* Uniforms from fragment shader, used here to optimize out useless computation in case of solid line. */
 uniform float dash_factor;  /* if > 1.0, solid line. */
-uniform int num_colors;  /* Enabled if > 0, 1 for solid line. */
+uniform int colors_len;  /* Enabled if > 0, 1 for solid line. */
 
 layout(lines) in;
 
@@ -36,7 +36,7 @@ void main()
 	gl_Position = v1 - (wdir * w1);
 	EmitVertex();
 
-	if ((num_colors == 1) || (dash_factor >= 1.0f)) {
+	if ((colors_len == 1) || (dash_factor >= 1.0f)) {
 		/* Solid line, optimize out distance computation! */
 		distance_along_line = 0.0f;
 	}