[Bf-blender-cvs] [8e54aaf41fa] greasepencil-object: Cleanup: remove gp_ prefix from variable names
Campbell Barton
noreply at git.blender.org
Mon May 28 19:28:41 CEST 2018
Commit: 8e54aaf41faafd050c1041f02a1ee8d6cd0af737
Author: Campbell Barton
Date: Mon May 28 19:28:16 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8e54aaf41faafd050c1041f02a1ee8d6cd0af737
Cleanup: remove gp_ prefix from variable names
These are already in a grease pencil struct.
===================================================================
M source/blender/blenkernel/intern/brush.c
M source/blender/editors/gpencil/gpencil_colorpick.c
M source/blender/editors/gpencil/gpencil_data.c
M source/blender/editors/gpencil/gpencil_fill.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/editors/interface/interface_icons.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_brush.c
===================================================================
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 7872c5173a5..36979f205a1 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -183,13 +183,13 @@ Brush *BKE_brush_add_gpencil(Main *bmain, ToolSettings *ts, const char *name)
brush->gpencil_settings = MEM_callocN(sizeof(BrushGpencilSettings), "BrushGpencilSettings");
brush->gpencil_settings->draw_smoothlvl = 1;
- brush->gpencil_settings->gp_flag = 0;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_PRESSURE;
+ brush->gpencil_settings->flag = 0;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_PRESSURE;
brush->gpencil_settings->draw_sensitivity = 1.0f;
brush->gpencil_settings->draw_strength = 1.0f;
brush->gpencil_settings->draw_jitter = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
- brush->gpencil_settings->gp_icon_id = GP_BRUSH_ICON_PEN;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gpencil_settings->icon_id = GP_BRUSH_ICON_PEN;
/* curves */
brush->gpencil_settings->curve_sensitivity = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
@@ -274,29 +274,29 @@ void BKE_brush_gpencil_presets(bContext *C)
/* Pencil brush */
brush = BKE_brush_add_gpencil(bmain, ts, "Draw Pencil");
brush->size = 25.0f;
- brush->gpencil_settings->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
brush->gpencil_settings->draw_sensitivity = 1.0f;
brush->gpencil_settings->draw_strength = 0.6f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
brush->gpencil_settings->draw_random_press = 0.0f;
brush->gpencil_settings->draw_jitter = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.5f;
brush->gpencil_settings->draw_smoothlvl = 1;
- brush->gpencil_settings->gp_thick_smoothfac = 1.0f;
- brush->gpencil_settings->gp_thick_smoothlvl = 3;
+ brush->gpencil_settings->thick_smoothfac = 1.0f;
+ brush->gpencil_settings->thick_smoothlvl = 3;
brush->gpencil_settings->draw_subdivide = 1;
brush->gpencil_settings->draw_random_sub = 0.0f;
- brush->gpencil_settings->gp_icon_id = GP_BRUSH_ICON_PENCIL;
- brush->gpencil_settings->gp_brush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gpencil_settings->icon_id = GP_BRUSH_ICON_PENCIL;
+ brush->gpencil_settings->brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
brush->smooth_stroke_factor = SMOOTH_STROKE_FACTOR;
@@ -305,30 +305,30 @@ void BKE_brush_gpencil_presets(bContext *C)
brush = BKE_brush_add_gpencil(bmain, ts, "Draw Pen");
deft = brush; /* save default brush */
brush->size = 30.0f;
- brush->gpencil_settings->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
brush->gpencil_settings->draw_sensitivity = 1.0f;
brush->gpencil_settings->draw_strength = 1.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
brush->gpencil_settings->draw_random_press = 0.0f;
brush->gpencil_settings->draw_random_strength = 0.0f;
brush->gpencil_settings->draw_jitter = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.5f;
brush->gpencil_settings->draw_smoothlvl = 1;
brush->gpencil_settings->draw_subdivide = 1;
- brush->gpencil_settings->gp_thick_smoothfac = 1.0f;
- brush->gpencil_settings->gp_thick_smoothlvl = 3;
+ brush->gpencil_settings->thick_smoothfac = 1.0f;
+ brush->gpencil_settings->thick_smoothlvl = 3;
brush->gpencil_settings->draw_random_sub = 0.0f;
- brush->gpencil_settings->gp_icon_id = GP_BRUSH_ICON_PEN;
- brush->gpencil_settings->gp_brush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gpencil_settings->icon_id = GP_BRUSH_ICON_PEN;
+ brush->gpencil_settings->brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
brush->smooth_stroke_factor = SMOOTH_STROKE_FACTOR;
@@ -336,7 +336,7 @@ void BKE_brush_gpencil_presets(bContext *C)
/* Ink brush */
brush = BKE_brush_add_gpencil(bmain, ts, "Draw Ink");
brush->size = 60.0f;
- brush->gpencil_settings->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
brush->gpencil_settings->draw_sensitivity = 1.6f;
brush->gpencil_settings->draw_strength = 1.0f;
@@ -344,20 +344,20 @@ void BKE_brush_gpencil_presets(bContext *C)
brush->gpencil_settings->draw_random_press = 0.0f;
brush->gpencil_settings->draw_jitter = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.5f;
brush->gpencil_settings->draw_smoothlvl = 1;
- brush->gpencil_settings->gp_thick_smoothfac = 1.0f;
- brush->gpencil_settings->gp_thick_smoothlvl = 3;
+ brush->gpencil_settings->thick_smoothfac = 1.0f;
+ brush->gpencil_settings->thick_smoothlvl = 3;
brush->gpencil_settings->draw_subdivide = 1;
brush->gpencil_settings->draw_random_sub = 0.0f;
- brush->gpencil_settings->gp_icon_id = GP_BRUSH_ICON_INK;
- brush->gpencil_settings->gp_brush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gpencil_settings->icon_id = GP_BRUSH_ICON_INK;
+ brush->gpencil_settings->brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
brush->smooth_stroke_factor = SMOOTH_STROKE_FACTOR;
@@ -371,30 +371,30 @@ void BKE_brush_gpencil_presets(bContext *C)
/* Ink Noise brush */
brush = BKE_brush_add_gpencil(bmain, ts, "Draw Noise");
brush->size = 60.0f;
- brush->gpencil_settings->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
brush->gpencil_settings->draw_sensitivity = 1.0f;
brush->gpencil_settings->draw_strength = 1.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_GROUP_RANDOM;
+ brush->gpencil_settings->flag |= GP_BRUSH_GROUP_RANDOM;
brush->gpencil_settings->draw_random_press = 0.7f;
brush->gpencil_settings->draw_random_strength = 0.0f;
brush->gpencil_settings->draw_jitter = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 1.0f;
brush->gpencil_settings->draw_smoothlvl = 2;
- brush->gpencil_settings->gp_thick_smoothfac = 0.5f;
- brush->gpencil_settings->gp_thick_smoothlvl = 2;
+ brush->gpencil_settings->thick_smoothfac = 0.5f;
+ brush->gpencil_settings->thick_smoothlvl = 2;
brush->gpencil_settings->draw_subdivide = 1;
brush->gpencil_settings->draw_random_sub = 0.0f;
- brush->gpencil_settings->gp_icon_id = GP_BRUSH_ICON_INKNOISE;
- brush->gpencil_settings->gp_brush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gpencil_settings->icon_id = GP_BRUSH_ICON_INKNOISE;
+ brush->gpencil_settings->brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
brush->smooth_stroke_factor = SMOOTH_STROKE_FACTOR;
@@ -408,29 +408,29 @@ void BKE_brush_gpencil_presets(bContext *C)
/* Block Basic brush */
brush = BKE_brush_add_gpencil(bmain, ts, "Draw Block");
brush->size = 150.0f;
- brush->gpencil_settings->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gpencil_settings->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
brush->gpencil_settings->draw_sensitivity = 1.0f;
brush->gpencil_settings->draw_strength = 0.7f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
brush->gpencil_settings->draw_random_press = 0.0f;
brush->gpencil_settings->draw_jitter = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gpencil_settings->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.0f;
brush->gpencil_settings->draw_smoothlvl = 1;
- brush->gpencil_settings->gp_thick_smoothfac = 1.0f;
- brush->gpencil_settings->gp_thick_smoothlvl = 3;
+ brush->gpencil_settings->thick_smoothfac = 1.0f;
+ brush->gpencil_settings->thick_smoothlvl = 3;
brush->gpencil_settings->draw_subdivide = 0;
brush->gpencil_settings->draw_random_sub = 0;
- brush->gpencil_settings->gp_icon_id = GP_BRUSH_ICON_BLOCK;
- brush->gpencil_settings->gp_brush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gpencil_settings->icon_id = GP_BRUSH_ICON_BLOCK;
+ brush->gpencil_settings->brush_type = GP_BRUSH_TYPE_DRAW;
brush->smooth_stroke_radius = SMOOTH_STROKE_RADIUS;
brush->smooth_stroke_factor = SMOOTH_STROKE_FACTOR;
@@ -438,30 +438,30 @@ void BKE_brush_gpencil_presets(bCont
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list