Commit: d610ef059ae19c1ae6f2f775861ad14a2424bebc
Author: Antonio Vazquez
Date: Fri Mar 9 19:27:22 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd610ef059ae19c1ae6f2f775861ad14a2424bebc
Cleanup: Rename brush type field
===================================================================
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/gpencil/gpencil_ops.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_utils.c
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index f3215a61ca1..a5e4feecfd0 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -591,7 +591,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
brush->icon_id = GPBRUSH_PENCIL;
- brush->type = GP_BRUSH_TYPE_DRAW;
+ brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
brush->lazy_radius = LAZY_RADIUS;
brush->lazy_factor = LAZY_FACTOR;
@@ -623,7 +623,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
brush->icon_id = GPBRUSH_PEN;
- brush->type = GP_BRUSH_TYPE_DRAW;
+ brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
brush->lazy_radius = LAZY_RADIUS;
brush->lazy_factor = LAZY_FACTOR;
@@ -653,7 +653,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
brush->icon_id = GPBRUSH_INK;
- brush->type = GP_BRUSH_TYPE_DRAW;
+ brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
brush->lazy_radius = LAZY_RADIUS;
brush->lazy_factor = LAZY_FACTOR;
@@ -689,7 +689,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
brush->icon_id = GPBRUSH_INKNOISE;
- brush->type = GP_BRUSH_TYPE_DRAW;
+ brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
brush->lazy_radius = LAZY_RADIUS;
brush->lazy_factor = LAZY_FACTOR;
@@ -726,7 +726,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_sub = 0;
copy_v3_v3(brush->curcolor, curcolor);
brush->icon_id = GPBRUSH_BLOCK;
- brush->type = GP_BRUSH_TYPE_DRAW;
+ brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
brush->lazy_radius = LAZY_RADIUS;
brush->lazy_factor = LAZY_FACTOR;
@@ -756,7 +756,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
brush->icon_id = GPBRUSH_MARKER;
- brush->type = GP_BRUSH_TYPE_DRAW;
+ brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
brush->lazy_radius = LAZY_RADIUS;
brush->lazy_factor = LAZY_FACTOR;
@@ -770,7 +770,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->fill_threshold = 0.1f;
brush->fill_simplylvl = 1;
brush->icon_id = GPBRUSH_FILL;
- brush->type = GP_BRUSH_TYPE_FILL;
+ brush->gpbrush_type = GP_BRUSH_TYPE_FILL;
brush->draw_smoothfac = 0.5f;
brush->draw_smoothlvl = 1;
@@ -789,7 +789,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->thickness = 30.0f;
brush->flag |= (GP_BRUSH_ENABLE_CURSOR | GP_BRUSH_DEFAULT_ERASER);
brush->icon_id = GPBRUSH_ERASE_SOFT;
- brush->type = GP_BRUSH_TYPE_ERASE;
+ brush->gpbrush_type = GP_BRUSH_TYPE_ERASE;
brush->eraser_mode = GP_BRUSH_ERASER_SOFT;
copy_v3_v3(brush->curcolor, curcolor);
@@ -798,7 +798,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->thickness = 30.0f;
brush->flag |= GP_BRUSH_ENABLE_CURSOR;
brush->icon_id = GPBRUSH_ERASE_HARD;
- brush->type = GP_BRUSH_TYPE_ERASE;
+ brush->gpbrush_type = GP_BRUSH_TYPE_ERASE;
brush->eraser_mode = GP_BRUSH_ERASER_HARD;
copy_v3_v3(brush->curcolor, curcolor);
@@ -807,7 +807,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->thickness = 30.0f;
brush->flag |= GP_BRUSH_ENABLE_CURSOR;
brush->icon_id = GPBRUSH_ERASE_STROKE;
- brush->type = GP_BRUSH_TYPE_ERASE;
+ brush->gpbrush_type = GP_BRUSH_TYPE_ERASE;
brush->eraser_mode = GP_BRUSH_ERASER_STROKE;
copy_v3_v3(brush->curcolor, curcolor);
}
diff --git a/source/blender/blenloader/intern/versioning_280.c
b/source/blender/blenloader/intern/versioning_280.c
index 037d86556aa..274a1a2d6c6 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1156,11 +1156,11 @@ void blo_do_versions_280(FileData *fd, Library
*UNUSED(lib), Main *main)
ToolSettings *ts = scene->toolsettings;
for (bGPDbrush *brush = ts->gp_brushes.first; brush;
brush = brush->next) {
if (brush->flag & GP_BRUSH_FILL_ONLY) {
- brush->type = GP_BRUSH_TYPE_FILL;
+ brush->gpbrush_type =
GP_BRUSH_TYPE_FILL;
brush->flag &= ~GP_BRUSH_FILL_ONLY;
}
else {
- brush->type = GP_BRUSH_TYPE_DRAW;
+ brush->gpbrush_type =
GP_BRUSH_TYPE_DRAW;
}
}
}
diff --git a/source/blender/editors/gpencil/gpencil_ops.c
b/source/blender/editors/gpencil/gpencil_ops.c
index be8c0b77a08..ea98552b7c5 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -119,7 +119,7 @@ static int gp_stroke_paintmode_draw_poll(bContext *C)
bGPdata *gpd = CTX_data_gpencil_data(C);
ToolSettings *ts = CTX_data_tool_settings(C);
bGPDbrush *brush = BKE_gpencil_brush_getactive(ts);
- return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
(brush->type == GP_BRUSH_TYPE_DRAW));
+ return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
(brush->gpbrush_type == GP_BRUSH_TYPE_DRAW));
}
/* Poll callback for stroke painting (erase brush) */
@@ -129,7 +129,7 @@ static int gp_stroke_paintmode_erase_poll(bContext *C)
bGPdata *gpd = CTX_data_gpencil_data(C);
ToolSettings *ts = CTX_data_tool_settings(C);
bGPDbrush *brush = BKE_gpencil_brush_getactive(ts);
- return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
(brush->type == GP_BRUSH_TYPE_ERASE));
+ return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
(brush->gpbrush_type == GP_BRUSH_TYPE_ERASE));
}
/* Poll callback for stroke painting (fill) */
@@ -139,7 +139,7 @@ static int gp_stroke_paintmode_fill_poll(bContext *C)
bGPdata *gpd = CTX_data_gpencil_data(C);
ToolSettings *ts = CTX_data_tool_settings(C);
bGPDbrush *brush = BKE_gpencil_brush_getactive(ts);
- return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
(brush->type == GP_BRUSH_TYPE_FILL));
+ return (gpd && (gpd->flag & GP_DATA_STROKE_PAINTMODE) && (brush) &&
(brush->gpbrush_type == GP_BRUSH_TYPE_FILL));
}
/* Poll callback for stroke sculpting mode */
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index cd2e339c2fa..f9afcfe77c1 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1475,7 +1475,7 @@ static bGPDbrush *gp_get_default_eraser(ToolSettings *ts)
{
bGPDbrush *brush_dft = NULL;
for (bGPDbrush *brush = ts->gp_brushes.first; brush; brush =
brush->next) {
- if ((brush->type == GP_BRUSH_TYPE_ERASE)) {
+ if ((brush->gpbrush_type == GP_BRUSH_TYPE_ERASE)) {
/* save first eraser to use later if no default */
if (brush_dft == NULL) {
brush_dft = brush;
@@ -1498,7 +1498,7 @@ static bGPDbrush *gp_get_default_eraser(ToolSettings *ts)
brush_dft->thickness = 30.0f;
brush_dft->flag |= (GP_BRUSH_ENABLE_CURSOR |
GP_BRUSH_DEFAULT_ERASER);
brush_dft->icon_id = GPBRUSH_ERASE_SOFT;
- brush_dft->type = GP_BRUSH_TYPE_ERASE;
+ brush_dft->gpbrush_type = GP_BRUSH_TYPE_ERASE;
brush_dft->eraser_mode = GP_BRUSH_ERASER_SOFT;
return brush_dft;
@@ -1527,7 +1527,7 @@ static void gp_init_drawing_brush(ToolSettings *ts,
tGPsdata *p)
/* asign to temp tGPsdata */
p->brush = brush;
- if (brush->type != GP_BRUSH_TYPE_ERASE) {
+ if (brush->gpbrush_type != GP_BRUSH_TYPE_ERASE) {
p->eraser = gp_get_default_eraser(ts);
}
else {
@@ -2202,7 +2202,7 @@ static int gpencil_draw_init(bContext *C, wmOperator *op,
const wmEvent *event)
/* if mode is draw and the brush is eraser, cancel */
if (paintmode != GP_PAINTMODE_ERASER) {
- if ((brush) && (brush->type == GP_BRUSH_TYPE_ERASE)) {
+ if ((brush) && (brush->gpbrush_type == GP_BRUSH_TYPE_ERASE)) {
return 0;
}
}
@@ -2242,7 +2242,7 @@ static int gpencil_draw_init(bContext *C, wmOperator *op,
const wmEvent *event)
static void gpencil_draw_cursor_set(tGPsdata *p)
{
bGPDbrush *brush = p->brush;
- if ((p->paintmode == GP_PAINTMODE_ERASER) || (brush->type ==
GP_BRUSH_TYPE_ERASE)) {
+ if ((p->paintmode == GP_PAINTMODE_ERASER) || (brush->gpbrush_type ==
GP_BRUSH_TYPE_ERASE)) {
WM_cursor_modal_set(p->win, BC_CROSSCURSOR); /* XXX need a
better cursor */
}
else {
diff --git a/source/blender/editors/gpencil/gpencil_utils.c
b/source/blender/editors/gpencil/gpencil_utils.c
index fd545c9decb..4f67998ccaa 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1387,7 +1387,7 @@ static void gp_brush_drawcursor(bContext *C, int x, int
y, void *customdata)
}
/* eraser has special shape and use a different shader
program */
- if (paintbrush->type == GP_BRUSH_TYPE_ERASE) {
+ if (paintbrush->gpbrush_type == GP_BRUSH_TYPE_ERASE) {
ED_gpencil_brush_draw_eraser(C, paintbrush, x,
y);
return;
}
@@ -1399,7 +1399,7 @@ static void gp_brush_drawcursor(bContext *C, int x, int
y, void *customdata)
if ((palcolor) && (GPENCIL_PAINT_MODE(gpd)) &&
((paintbrush->flag & GP_BRUSH_STABILIZE_MOUSE)
== 0) &&
((paintbrush->flag &
GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0) &&
- (paintbrush->type == GP_BRUSH_TYPE_DRAW))
+ (paintbrush->gpbrush_type ==
GP_BRUSH_TYPE_DRAW))
{
radius = 2.0f;
copy_v3_v3(color, palcolor->rgb);
@@ -1441,7 +1441,7 @@ static void gp_brush_drawcursor(bContext *C, int x, int
y, void *customdata)
if ((palcolor) && (GPENCIL_PAINT_MODE(gpd)) &&
((paintbrush->flag & GP_BRUSH_STABILIZE_MOUSE) == 0) &&
((paintbrush->flag & GP_BRUSH_STABILIZE_MOUSE_TEMP) == 0) &&
- (paintbrush->type == GP_BRUSH_TYPE_DRAW))
+ (paintbrush->gpbrush_type == GP_BRUSH_TYPE_DRAW))
{
imm_draw_circle_fill_2d(pos, x, y, radius, 40);
}
diff --git a/source/blender/makesdna/DNA_gpencil_types.h
b/source/blender/makesdna/DNA_gpencil_types.h
index 79411b0c5cb..d24fbc56194 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -139,7 +139,7 @@ typedef struct bGPDbrush {
float uv_random; /* random factor for UV rotation */
int input_samples; /* maximum distance before generate
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
