[Bf-blender-cvs] [014395cb533] greasepencil-object: Rename variable after merge

[Antonio Vazquez]

Commit: 014395cb5337cf45ce734bf2825b16a20f839e31
Author: Antonio Vazquez
Date:   Sun Jul 1 11:09:59 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB014395cb5337cf45ce734bf2825b16a20f839e31

Rename variable after merge

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

M	source/blender/editors/gpencil/annotate_paint.c
M	source/blender/editors/gpencil/gpencil_utils.c

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

diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 01068d738d1..2d532633d55 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -1548,7 +1548,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr)
 		immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
 
 		immUniformColor4f(1.0f, 0.39f, 0.39f, 0.78f);
-		immUniform1i("num_colors", 0);  /* "simple" mode */
+		immUniform1i("colors_len", 0);  /* "simple" mode */
 		immUniform1f("dash_width", 12.0f);
 		immUniform1f("dash_factor", 0.5f);
 
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index b934b8cf757..e7315483200 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1326,7 +1326,7 @@ void ED_gpencil_brush_draw_eraser(Brush *brush, int x, int y)
 	immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
 
 	immUniformColor4f(1.0f, 0.39f, 0.39f, 0.78f);
-	immUniform1i("num_colors", 0);  /* "simple" mode */
+	immUniform1i("colors_len", 0);  /* "simple" mode */
 	immUniform1f("dash_width", 12.0f);
 	immUniform1f("dash_factor", 0.5f);