[Bf-blender-cvs] [e17f5584e1d] greasepencil-object: Disable cursor color for fill brush

[Antonio Vazquez]

Commit: e17f5584e1dfc220476ed3472ec4043ff95bca50
Author: Antonio Vazquez
Date:   Sun Jan 28 13:56:15 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe17f5584e1dfc220476ed3472ec4043ff95bca50

Disable cursor color for fill brush

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

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

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

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 462a06260d8..d51267ffb35 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1285,7 +1285,8 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *customdata)
 			 * The decision was to use a fix size, instead of paintbrush->thickness value. 
 			 */
 			if ((palcolor) && (GPENCIL_PAINT_MODE(gpd)) && 
-				((paintbrush->flag & GP_BRUSH_LAZY_MOUSE) == 0)) 
+				((paintbrush->flag & GP_BRUSH_LAZY_MOUSE) == 0) &&
+				((paintbrush->flag & GP_BRUSH_FILL_ONLY) == 0))
 			{
 				radius = 2.0f;
 				copy_v3_v3(color, palcolor->rgb);
@@ -1325,7 +1326,8 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *customdata)
 	/* Inner Ring: Color from UI panel */
 	immUniformColor4f(color[0], color[1], color[2], 0.8f);
 	if ((palcolor) && (GPENCIL_PAINT_MODE(gpd)) && 
-		((paintbrush->flag & GP_BRUSH_LAZY_MOUSE) == 0))
+		((paintbrush->flag & GP_BRUSH_LAZY_MOUSE) == 0) &&
+		((paintbrush->flag & GP_BRUSH_FILL_ONLY) == 0))
 	{
 		imm_draw_circle_fill_2d(pos, x, y, radius, 40);
 	}