[Bf-blender-cvs] [04da7dadbb6] greasepencil-object: Fix error in cursor color for sculpt modes
Antonio Vazquez
noreply at git.blender.org
Sun Jan 28 10:49:54 CET 2018
Commit: 04da7dadbb67156f9c31b006775f35daf9805a4b
Author: Antonio Vazquez
Date: Sun Jan 28 10:49:45 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB04da7dadbb67156f9c31b006775f35daf9805a4b
Fix error in cursor color for sculpt modes
The cursor color only must be vsisible in draw mode, not in sculpt
===================================================================
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/makesdna/DNA_gpencil_types.h
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index d49d0203a5d..1ef14970eab 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1285,7 +1285,7 @@ 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.
*/
radius = 3.0f;
- if (palcolor) {
+ if ((palcolor) && (GPENCIL_PAINT_MODE(gpd))) {
copy_v3_v3(color, palcolor->rgb);
}
else {
@@ -1321,7 +1321,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) || ((paintbrush) && (paintbrush->flag & GP_BRUSH_LAZY_MOUSE))) {
+ if ((palcolor) && (GPENCIL_PAINT_MODE(gpd)))
+ {
imm_draw_circle_fill_2d(pos, x, y, radius, 40);
}
else {
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h
index 2d6c8752fcc..fc35261d9ec 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -563,6 +563,7 @@ typedef enum eGP_BrushIcons {
/* Macros to check grease pencil modes */
#define GPENCIL_ANY_MODE(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_PAINTMODE | GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))
#define GPENCIL_ANY_EDIT_MODE(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))
+#define GPENCIL_PAINT_MODE(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_PAINTMODE)))
#define GPENCIL_SCULPT_OR_WEIGHT_MODE(gpd) ((gpd) && (gpd->flag & (GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)))
#define GPENCIL_NONE_EDIT_MODE(gpd) ((gpd) && ((gpd->flag & (GP_DATA_STROKE_EDITMODE | GP_DATA_STROKE_SCULPTMODE | GP_DATA_STROKE_WEIGHTMODE)) == 0))
More information about the Bf-blender-cvs
mailing list