Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-11-18 20:07:16 +0300
committerAntonioya <blendergit@gmail.com>2018-11-18 20:07:16 +0300
commit991bb0076219d944225304175ac7ad58b881d173 (patch)
tree2e1327a366bdb2536cdeca527ad38d5d93a2b2e8
parent1b7b1d60c5df7f2ca498e27c3f0977ff4a8ac25b (diff)
GP: Rename GPENCIL_OT_brush_paint to GPENCIL_OT_sculpt_paint
This makes the operator name more consistent. Part of T57818
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py10
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py2
-rw-r--r--source/blender/editors/gpencil/gpencil_brush.c4
-rw-r--r--source/blender/editors/gpencil/gpencil_intern.h2
-rw-r--r--source/blender/editors/gpencil/gpencil_ops.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 9453c3ae134..f32b9d8fb73 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -3031,11 +3031,11 @@ def km_grease_pencil_stroke_sculpt_mode(params):
# Selection
*_grease_pencil_selection(params),
# Painting
- ("gpencil.brush_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.brush_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.brush_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
+ ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
@@ -3064,9 +3064,9 @@ def km_grease_pencil_stroke_weight_mode(params):
# Selection
*_grease_pencil_selection(params),
# Painting
- ("gpencil.brush_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.brush_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
+ ("gpencil.sculpt_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index ff92b3731c3..732efe603fe 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -573,7 +573,7 @@ class GPENCIL_MT_pie_sculpt(Menu):
col = pie.column()
# col.label(text="Tool:")
col.prop(settings, "sculpt_tool", text="")
- col.operator("gpencil.brush_paint", text="Sculpt", icon='SCULPTMODE_HLT')
+ col.operator("gpencil.sculpt_paint", text="Sculpt", icon='SCULPTMODE_HLT')
# E - Common Settings
col = pie.column(align=True)
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c
index 18ff0efd3f9..0c603927c1c 100644
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@ -2091,11 +2091,11 @@ static int gpsculpt_brush_modal(bContext *C, wmOperator *op, const wmEvent *even
return OPERATOR_RUNNING_MODAL;
}
-void GPENCIL_OT_brush_paint(wmOperatorType *ot)
+void GPENCIL_OT_sculpt_paint(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Stroke Sculpt";
- ot->idname = "GPENCIL_OT_brush_paint";
+ ot->idname = "GPENCIL_OT_sculpt_paint";
ot->description = "Apply tweaks to strokes by painting over the strokes"; // XXX
/* api callbacks */
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index d94b5d49add..d737d34a017 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -328,7 +328,7 @@ void GPENCIL_OT_reproject(struct wmOperatorType *ot);
/* stroke sculpting -- */
-void GPENCIL_OT_brush_paint(struct wmOperatorType *ot);
+void GPENCIL_OT_sculpt_paint(struct wmOperatorType *ot);
/* buttons editing --- */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index a199f943a8d..01221f57f05 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -266,7 +266,7 @@ void ED_operatortypes_gpencil(void)
WM_operatortype_append(GPENCIL_OT_reproject);
- WM_operatortype_append(GPENCIL_OT_brush_paint);
+ WM_operatortype_append(GPENCIL_OT_sculpt_paint);
/* Editing (Buttons) ------------ */