[Bf-blender-cvs] [9c5e02d1d30] greasepencil-object: GPencil: Rename Tint to Vertex Paint
Antonio Vazquez
noreply at git.blender.org
Fri Nov 8 18:28:33 CET 2019
Commit: 9c5e02d1d30761f2b94cef6f1d797c798d8cbd8c
Author: Antonio Vazquez
Date: Fri Nov 8 18:28:21 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB9c5e02d1d30761f2b94cef6f1d797c798d8cbd8c
GPencil: Rename Tint to Vertex Paint
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/editors/gpencil/CMakeLists.txt
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_ops.c
R084 source/blender/editors/gpencil/gpencil_tint.c source/blender/editors/gpencil/gpencil_vertex_paint.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 02f543bed01..5de0e04c3e5 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -3282,9 +3282,9 @@ def km_grease_pencil_stroke_paint_tint(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
])
@@ -3386,9 +3386,9 @@ def km_grease_pencil_stroke_vertex_draw(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
@@ -3411,9 +3411,9 @@ def km_grease_pencil_stroke_vertex_blur(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
@@ -3436,9 +3436,9 @@ def km_grease_pencil_stroke_vertex_average(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
@@ -3461,9 +3461,9 @@ def km_grease_pencil_stroke_vertex_smear(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index d0e0c73308a..037c3462dd7 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -2471,9 +2471,9 @@ def km_grease_pencil_stroke_paint_tint(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
])
@@ -2581,9 +2581,9 @@ def km_grease_pencil_stroke_vertex_draw(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
@@ -2606,9 +2606,9 @@ def km_grease_pencil_stroke_vertex_blur(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
@@ -2631,9 +2631,9 @@ def km_grease_pencil_stroke_vertex_average(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
{"properties": [("wait_for_input", False)]}),
# Brush strength
("wm.radial_control", {"type": 'F', "value": 'PRESS', "shift": True},
@@ -2656,9 +2656,9 @@ def km_grease_pencil_stroke_vertex_smear(params):
items.extend([
# Tint
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS'},
{"properties": [("wait_for_input", False)]}),
- ("gpencil.tint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
+ ("gpencil.vertex_paint", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": 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/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index ba077e3e590..5596172610c 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1627,7 +1627,7 @@ class _defs_gpencil_vertex:
attr="gpencil_vertex_tool",
cursor='DOT',
tooldef_keywords=dict(
- operator="gpencil.tint",
+ operator="gpencil.vertex_paint",
),
)
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 81443cb4968..ffab1bf6244 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -48,7 +48,6 @@ set(SRC
gpencil_data.c
gpencil_edit.c
gpencil_fill.c
- gpencil_tint.c
gpencil_interpolate.c
gpencil_merge.c
gpencil_ops.c
@@ -59,6 +58,7 @@ set(SRC
gpencil_undo.c
gpencil_utils.c
gpencil_uv.c
+ gpencil_vertex_paint.c
gpencil_intern.h
)
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 3c4f8acf15e..c63ff173261 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -365,7 +365,7 @@ void GPENCIL_OT_annotate(struct wmOperatorType *ot);
void GPENCIL_OT_draw(struct wmOperatorType *ot);
void GPENCIL_OT_fill(struct wmOperatorType *ot);
-void GPENCIL_OT_tint(struct wmOperatorType *ot);
+void GPENCIL_OT_vertex_paint(struct wmOperatorType *ot);
/* Guides ----------------------- */
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index ccaae44f3c8..ddc9ca5f059 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -334,7 +334,7 @@ void ED_operatortypes_gpencil(void)
WM_operatortype_append(GPENCIL_OT_draw);
WM_operatortype_append(GPENCIL_OT_fill);
- WM_operatortype_append(GPENCIL_OT_tint);
+ WM_operatortype_append(GPENCIL_OT_vertex_paint);
/* Guides ----------------------- */
diff --git a/source/blender/editors/gpencil/gpencil_tint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c
similarity index 84%
rename from source/blender/editors/gpencil/gpencil_tint.c
rename to source/blender/editors/gpencil/gpencil_vertex_paint.c
index 571f2e9e1b7..12ee20e2846 100644
--- a/source/blender/editors/gpencil/gpencil_tint.c
+++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c
@@ -59,7 +59,7 @@
/* ************************************************ */
/* General Brush Editing Context */
-/* Temp Flags while Tinting. */
+/* Temp Flags while Painting. */
typedef enum eGPDvertex_brush_Flag {
/* invert the effect of the brush */
GP_VERTEX_FLAG_INVERT = (1 << 0),
@@ -68,7 +68,7 @@ typedef enum eGPDvertex_brush_Flag {
} eGPDvertex_brush_Flag;
/* Context for brush operators */
-typedef struct tGP_BrushTintData {
+typedef struct tGP_BrushVertexpaintData {
struct Main *bmain;
Scene *scene;
Object *object;
@@ -90,7 +90,7 @@ typedef struct tGP_BrushTintData {
bool is_painting;
bool is_transformed;
- /* Start of new tint */
+ /* Start of new paint */
bool first;
/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list