Commit: 20ddf3a147f7650d478b651a8286b46cbcd3e842
Author: Antonio Vazquez
Date: Sat Mar 10 13:25:36 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB20ddf3a147f7650d478b651a8286b46cbcd3e842
Code refactor: Rename fields to prepare for ID datablock
Rename some fields to prepare the code to move the brushes (bGPDbrush) to reuse
ID datablock ID_BR (Brush).
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenloader/intern/versioning_280.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/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_scene.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 469c949d1ca..c93ed11a47b 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 469c949d1ca882be19daa128842f813b72a944d8
+Subproject commit c93ed11a47b3016cf59711ec16de2e2e94c30e99
diff --git a/release/scripts/addons b/release/scripts/addons
index c88411ff777..371960484a3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c88411ff7776a2db5d6ef6117a1b2faa42a95611
+Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 310578043de..a8515cfdfe9 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 310578043dec1aae382eb6a447ae1d103792d7e6
+Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 5fa093e9d04..8103f5f02c0 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2104,22 +2104,22 @@ class VIEW3D_PT_tools_grease_pencil_brush(Panel):
if brush.type == 'FILL':
col = layout.column(align=True)
- col.prop(brush, "fill_leak", text="Leak Size")
+ col.prop(brush, "gpencil_fill_leak", text="Leak Size")
col.prop(brush, "line_width", text="Thickness")
- col.prop(brush, "fill_simplyfy_lvl", text="Simplify")
+ col.prop(brush, "gpencil_fill_simplyfy_lvl", text="Simplify")
col = layout.column(align=True)
col.label(text="Boundary Draw Mode:")
row = col.row(align=True)
- row.prop(brush, "fill_draw_mode", text="")
- row.prop(brush, "fill_show_boundary", text="", icon='GRID')
+ row.prop(brush, "gpencil_fill_draw_mode", text="")
+ row.prop(brush, "gpencil_fill_show_boundary", text="",
icon='GRID')
col = layout.column(align=True)
- col.enabled = brush.fill_draw_mode != "STROKE"
- col.prop(brush, "fill_hide", text="Hide Transparent Lines")
+ col.enabled = brush.gpencil_fill_draw_mode != "STROKE"
+ col.prop(brush, "gpencil_fill_hide", text="Hide Transparent
Lines")
sub = col.row(align=True)
- sub.enabled = brush.fill_hide
- sub.prop(brush, "fill_threshold", text="Threshold")
+ sub.enabled = brush.gpencil_fill_hide
+ sub.prop(brush, "gpencil_fill_threshold", text="Threshold")
if brush.type == 'ERASE':
col = layout.column(align=True)
@@ -2223,7 +2223,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_mode(Panel):
layout = self.layout
brush = context.active_gpencil_brush
if brush is not None:
- layout.prop(brush, "type", expand=True)
+ layout.prop(brush, "gpencil_brush_type", expand=True)
# Grease Pencil drawingcurves
class VIEW3D_PT_tools_grease_pencil_brushcurves(Panel):
diff --git a/source/blender/blenkernel/intern/gpencil.c
b/source/blender/blenkernel/intern/gpencil.c
index a5e4feecfd0..c16159c0e83 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -567,71 +567,71 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
/* Pencil brush */
brush = BKE_gpencil_brush_addnew(ts, "Pencil", false);
brush->thickness = 25.0f;
- brush->flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE |
GP_BRUSH_ENABLE_CURSOR);
+ brush->gp_flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE
| GP_BRUSH_ENABLE_CURSOR);
brush->draw_sensitivity = 1.0f;
- brush->flag |= GP_BRUSH_USE_RANDOM_STRENGTH;
+ brush->gp_flag |= GP_BRUSH_USE_RANDOM_STRENGTH;
brush->draw_strength = 0.6f;
- brush->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
brush->draw_random_press = 0.0f;
brush->draw_jitter = 0.0f;
- brush->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->draw_angle = 0.0f;
brush->draw_angle_factor = 0.0f;
- brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
brush->draw_smoothfac = 0.5f;
brush->draw_smoothlvl = 1;
- brush->thick_smoothfac = 1.0f;
- brush->thick_smoothlvl = 3;
- brush->subdivide = 1;
+ brush->gp_thick_smoothfac = 1.0f;
+ brush->gp_thick_smoothlvl = 3;
+ brush->draw_subdivide = 1;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
- brush->icon_id = GPBRUSH_PENCIL;
- brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gp_icon_id = GPBRUSH_PENCIL;
+ brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
- brush->lazy_radius = LAZY_RADIUS;
- brush->lazy_factor = LAZY_FACTOR;
+ brush->gp_lazy_radius = LAZY_RADIUS;
+ brush->gp_lazy_factor = LAZY_FACTOR;
/* Pen brush */
brush = BKE_gpencil_brush_addnew(ts, "Pen", true);
brush->thickness = 30.0f;
- brush->flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE |
GP_BRUSH_ENABLE_CURSOR);
+ brush->gp_flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE
| GP_BRUSH_ENABLE_CURSOR);
brush->draw_sensitivity = 1.0f;
- brush->flag |= GP_BRUSH_USE_RANDOM_STRENGTH;
+ brush->gp_flag |= GP_BRUSH_USE_RANDOM_STRENGTH;
brush->draw_strength = 1.0f;
- brush->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
brush->draw_random_press = 0.0f;
brush->draw_jitter = 0.0f;
- brush->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->draw_angle = 0.0f;
brush->draw_angle_factor = 0.0f;
- brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
brush->draw_smoothfac = 0.5f;
brush->draw_smoothlvl = 1;
- brush->subdivide = 1;
- brush->thick_smoothfac = 1.0f;
- brush->thick_smoothlvl = 3;
+ brush->draw_subdivide = 1;
+ brush->gp_thick_smoothfac = 1.0f;
+ brush->gp_thick_smoothlvl = 3;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
- brush->icon_id = GPBRUSH_PEN;
- brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gp_icon_id = GPBRUSH_PEN;
+ brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
- brush->lazy_radius = LAZY_RADIUS;
- brush->lazy_factor = LAZY_FACTOR;
+ brush->gp_lazy_radius = LAZY_RADIUS;
+ brush->gp_lazy_factor = LAZY_FACTOR;
/* Ink brush */
brush = BKE_gpencil_brush_addnew(ts, "Ink", true);
brush->thickness = 60.0f;
- brush->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
brush->draw_sensitivity = 1.6f;
brush->draw_strength = 1.0f;
@@ -639,24 +639,24 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_press = 0.0f;
brush->draw_jitter = 0.0f;
- brush->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->draw_angle = 0.0f;
brush->draw_angle_factor = 0.0f;
- brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
brush->draw_smoothfac = 0.5f;
brush->draw_smoothlvl = 1;
- brush->thick_smoothfac = 1.0f;
- brush->thick_smoothlvl = 3;
- brush->subdivide = 1;
+ brush->gp_thick_smoothfac = 1.0f;
+ brush->gp_thick_smoothlvl = 3;
+ brush->draw_subdivide = 1;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
- brush->icon_id = GPBRUSH_INK;
- brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gp_icon_id = GPBRUSH_INK;
+ brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
- brush->lazy_radius = LAZY_RADIUS;
- brush->lazy_factor = LAZY_FACTOR;
+ brush->gp_lazy_radius = LAZY_RADIUS;
+ brush->gp_lazy_factor = LAZY_FACTOR;
/* Curve */
custom_curve = brush->cur_sensitivity;
@@ -667,7 +667,7 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
/* Ink Noise brush */
brush = BKE_gpencil_brush_addnew(ts, "Ink noise", false);
brush->thickness = 60.0f;
- brush->flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE |
GP_BRUSH_ENABLE_CURSOR);
+ brush->gp_flag |= (GP_BRUSH_USE_RANDOM_PRESSURE | GP_BRUSH_USE_PRESSURE
| GP_BRUSH_ENABLE_CURSOR);
brush->draw_sensitivity = 1.0f;
brush->draw_strength = 1.0f;
@@ -675,24 +675,24 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
brush->draw_random_press = 0.7f;
brush->draw_jitter = 0.0f;
- brush->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->draw_angle = 0.0f;
brush->draw_angle_factor = 0.0f;
- brush->flag_group |= GP_BRUSH_GROUP_SETTINGS;
+ brush->gp_flag |= GP_BRUSH_GROUP_SETTINGS;
brush->draw_smoothfac = 1.0f;
brush->draw_smoothlvl = 2;
- brush->thick_smoothfac = 0.5f;
- brush->thick_smoothlvl = 2;
- brush->subdivide = 1;
+ brush->gp_thick_smoothfac = 0.5f;
+ brush->gp_thick_smoothlvl = 2;
+ brush->draw_subdivide = 1;
brush->draw_random_sub = 0.0f;
copy_v3_v3(brush->curcolor, curcolor);
- brush->icon_id = GPBRUSH_INKNOISE;
- brush->gpbrush_type = GP_BRUSH_TYPE_DRAW;
+ brush->gp_icon_id = GPBRUSH_INKNOISE;
+ brush->gp_brush_type = GP_BRUSH_TYPE_DRAW;
- brush->lazy_radius = LAZY_RADIUS;
- brush->lazy_factor = LAZY_FACTOR;
+ brush->gp_lazy_radius = LAZY_RADIUS;
+ brush->gp_lazy_factor = LAZY_FACTOR;
/* Curve */
custom_curve = brush->cur_sensitivity;
@@ -703,38 +703,38 @@ void BKE_gpencil_brush_init_presets(ToolSettings *ts)
/* Block Basic brush */
brush = BKE_gpencil_brush_addnew(ts, "Block Basic", false);
brush->thickness = 150.0f;
- brush->flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
+ brush->gp_flag |= (GP_BRUSH_USE_PRESSURE | GP_BRUSH_ENABLE_CURSOR);
brush->draw_sensitivity = 1.0f;
brush->draw_strength = 0.7f;
- brush->flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_STENGTH_PRESSURE;
brush->draw_random_press = 0.0f;
brush->draw_jitter = 0.0f;
- brush->flag |= GP_BRUSH_USE_JITTER_PRESSURE;
+ brush->gp_flag |= GP_BRUSH_USE_JITTER_PRESSURE;
brush->draw_angle =
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
