[Bf-blender-cvs] [ed21ed30303] greasepencil-object: GPencil: Rename Transform UV to Transform Fill
Antonio Vazquez
noreply at git.blender.org
Mon Nov 11 16:22:42 CET 2019
Commit: ed21ed30303ddd4e20850844fe7a8401dd6a69ea
Author: Antonio Vazquez
Date: Mon Nov 11 16:22:29 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBed21ed30303ddd4e20850844fe7a8401dd6a69ea
GPencil: Rename Transform UV to Transform Fill
This affects to reset_uv also.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_ops.c
M source/blender/editors/gpencil/gpencil_uv.c
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 4af32cf6967..7916c870c5d 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -6152,12 +6152,12 @@ def km_3d_view_tool_edit_gpencil_to_sphere(params):
)
-def km_3d_view_tool_edit_gpencil_transform_uv(params):
+def km_3d_view_tool_edit_gpencil_transform_fill(params):
return (
- "3D View Tool: Edit Gpencil, Transform UV",
+ "3D View Tool: Edit Gpencil, Transform Fill",
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": [
- ("gpencil.transform_uv", {"type": params.tool_tweak, "value": 'ANY'},
+ ("gpencil.transform_fill", {"type": params.tool_tweak, "value": 'ANY'},
{"properties": [("release_confirm", True)]}),
]},
)
@@ -6429,7 +6429,7 @@ def generate_keymaps(params=None):
km_3d_view_tool_edit_gpencil_bend(params),
km_3d_view_tool_edit_gpencil_shear(params),
km_3d_view_tool_edit_gpencil_to_sphere(params),
- km_3d_view_tool_edit_gpencil_transform_uv(params),
+ km_3d_view_tool_edit_gpencil_transform_fill(params),
km_3d_view_tool_sculpt_gpencil_paint(params),
km_3d_view_tool_sculpt_gpencil_select(params),
km_3d_view_tool_sculpt_gpencil_select_box(params),
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 5596172610c..f96f05188be 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1542,17 +1542,17 @@ class _defs_gpencil_edit:
)
@ToolDef.from_fn
- def transform_uv():
+ def transform_fill():
def draw_settings(context, layout, tool):
- props = tool.operator_properties("gpencil.transform_uv")
+ props = tool.operator_properties("gpencil.transform_fill")
row = layout.row()
row.use_property_split = False
row.prop(props, "mode", expand=True)
return dict(
- idname="builtin.transform_uv",
- label="Transform UV",
- icon="ops.gpencil.transform_uv",
+ idname="builtin.transform_fill",
+ label="Transform Fill",
+ icon="ops.gpencil.transform_fill",
cursor='DEFAULT',
widget=None,
keymap=(),
@@ -2132,7 +2132,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
_defs_gpencil_edit.tosphere,
),
None,
- _defs_gpencil_edit.transform_uv,
+ _defs_gpencil_edit.transform_fill,
],
'SCULPT_GPENCIL': [
_defs_gpencil_sculpt.generate_from_brushes,
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 180721511b5..f9d07f397ae 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4674,7 +4674,7 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu):
layout.operator("gpencil.stroke_flip", text="Switch Direction")
layout.separator()
- layout.operator("gpencil.reset_uv_transform", text="Reset UV Transform")
+ layout.operator("gpencil.reset_transform_fill", text="Reset Fill Transform")
class VIEW3D_MT_edit_gpencil_point(Menu):
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index e7efe1998fa..ee015276956 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -498,8 +498,8 @@ void GPENCIL_OT_stroke_trim(struct wmOperatorType *ot);
void GPENCIL_OT_stroke_merge_by_distance(struct wmOperatorType *ot);
void GPENCIL_OT_stroke_merge_material(struct wmOperatorType *ot);
-void GPENCIL_OT_transform_uv(struct wmOperatorType *ot);
-void GPENCIL_OT_reset_uv_transform(struct wmOperatorType *ot);
+void GPENCIL_OT_transform_fill(struct wmOperatorType *ot);
+void GPENCIL_OT_reset_transform_fill(struct wmOperatorType *ot);
void GPENCIL_OT_brush_presets_create(struct wmOperatorType *ot);
diff --git a/source/blender/editors/gpencil/gpencil_ops.c b/source/blender/editors/gpencil/gpencil_ops.c
index b0e348be277..c4afb025d09 100644
--- a/source/blender/editors/gpencil/gpencil_ops.c
+++ b/source/blender/editors/gpencil/gpencil_ops.c
@@ -447,8 +447,8 @@ void ED_operatortypes_gpencil(void)
WM_operatortype_append(GPENCIL_OT_stroke_merge_by_distance);
WM_operatortype_append(GPENCIL_OT_stroke_merge_material);
- WM_operatortype_append(GPENCIL_OT_transform_uv);
- WM_operatortype_append(GPENCIL_OT_reset_uv_transform);
+ WM_operatortype_append(GPENCIL_OT_transform_fill);
+ WM_operatortype_append(GPENCIL_OT_reset_transform_fill);
WM_operatortype_append(GPENCIL_OT_brush_presets_create);
diff --git a/source/blender/editors/gpencil/gpencil_uv.c b/source/blender/editors/gpencil/gpencil_uv.c
index 18a3216d979..e5f2bd76d0a 100644
--- a/source/blender/editors/gpencil/gpencil_uv.c
+++ b/source/blender/editors/gpencil/gpencil_uv.c
@@ -238,7 +238,7 @@ static void gpencil_uv_transform_exit(bContext *C, wmOperator *op)
MEM_SAFE_FREE(op->customdata);
}
-static void gpencil_uv_transform_cancel(bContext *C, wmOperator *op)
+static void gpencil_transform_fill_cancel(bContext *C, wmOperator *op)
{
GpUvData *opdata;
@@ -358,7 +358,7 @@ static bool gpencil_uv_transform_calc(bContext *C, wmOperator *op)
return changed;
}
-static int gpencil_uv_transform_exec(bContext *C, wmOperator *op)
+static int gpencil_transform_fill_exec(bContext *C, wmOperator *op)
{
if (!gpencil_uv_transform_init(C, op, false)) {
return OPERATOR_CANCELLED;
@@ -373,7 +373,7 @@ static int gpencil_uv_transform_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-static bool gpencil_uv_transform_poll(bContext *C)
+static bool gpencil_transform_fill_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
if ((ob == NULL) || (ob->type != OB_GPENCIL)) {
@@ -393,7 +393,7 @@ static bool gpencil_uv_transform_poll(bContext *C)
return true;
}
-static int gpencil_uv_transform_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+static int gpencil_transform_fill_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
RegionView3D *rv3d = CTX_wm_region_view3d(C);
float mlen[2];
@@ -429,14 +429,14 @@ static int gpencil_uv_transform_invoke(bContext *C, wmOperator *op, const wmEven
return OPERATOR_RUNNING_MODAL;
}
-static int gpencil_uv_transform_modal(bContext *C, wmOperator *op, const wmEvent *event)
+static int gpencil_transform_fill_modal(bContext *C, wmOperator *op, const wmEvent *event)
{
GpUvData *opdata = op->customdata;
switch (event->type) {
case ESCKEY:
case RIGHTMOUSE: {
- gpencil_uv_transform_cancel(C, op);
+ gpencil_transform_fill_cancel(C, op);
return OPERATOR_CANCELLED;
}
case MOUSEMOVE: {
@@ -447,7 +447,7 @@ static int gpencil_uv_transform_modal(bContext *C, wmOperator *op, const wmEvent
gpencil_uv_transform_update_header(op, C);
}
else {
- gpencil_uv_transform_cancel(C, op);
+ gpencil_transform_fill_cancel(C, op);
return OPERATOR_CANCELLED;
}
break;
@@ -468,7 +468,7 @@ static int gpencil_uv_transform_modal(bContext *C, wmOperator *op, const wmEvent
return OPERATOR_RUNNING_MODAL;
}
-void GPENCIL_OT_transform_uv(wmOperatorType *ot)
+void GPENCIL_OT_transform_fill(wmOperatorType *ot)
{
static const EnumPropertyItem uv_mode[] = {
{GP_UV_TRANSLATE, "TRANSLATE", 0, "Translate", ""},
@@ -480,16 +480,16 @@ void GPENCIL_OT_transform_uv(wmOperatorType *ot)
PropertyRNA *prop;
/* identifiers */
- ot->name = "Transform Stroke UV";
- ot->idname = "GPENCIL_OT_transform_uv";
- ot->description = "Transform Grease Pencil Stroke UVs";
+ ot->name = "Transform Stroke Fill";
+ ot->idname = "GPENCIL_OT_transform_fill";
+ ot->description = "Transform Grease Pencil Stroke Fill";
/* api callbacks */
- ot->invoke = gpencil_uv_transform_invoke;
- ot->modal = gpencil_uv_transform_modal;
- ot->exec = gpencil_uv_transform_exec;
- ot->cancel = gpencil_uv_transform_cancel;
- ot->poll = gpencil_uv_transform_poll;
+ ot->invoke = gpencil_transform_fill_invoke;
+ ot->modal = gpencil_transform_fill_modal;
+ ot->exec = gpencil_transform_fill_exec;
+ ot->cancel = gpencil_transform_fill_cancel;
+ ot->poll = gpencil_transform_fill_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_GRAB_CURSOR_XY | OPTYPE_BLOCKING;
@@ -523,7 +523,7 @@ void GPENCIL_OT_transform_uv(wmOperatorType *ot)
}
/* Clear UV transformations. */
-static int gpencil_reset_uv_transform_exec(bContext *C, wmOperator *op)
+static int gpencil_reset_transform_fill_exec(bContext *C, wmOperator *op)
{
const int mode = RNA_enum_get(op->ptr, "mode");
Object *ob = CTX_data_active_object(C);
@@ -557,7 +557,7 @@ static int gpencil_reset_uv_transform_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-void GPENCIL_OT_reset_uv_transform(wmOperatorType *ot)
+void GPENCIL_OT_reset_transform_fill(wmOperatorType *ot)
{
static const EnumPropertyItem uv_clear_mode[] = {
{GP_UV_ALL, "ALL", 0, "All", ""},
@@ -568,13 +568,13 @@ void GPENCIL_OT_reset_uv_transform(wmOperatorType *ot)
};
/* identifiers */
- ot->name = "Reset UV Transformations";
- ot->idname = "GPENCIL_OT_reset_uv_transform";
+ ot->name = "Reset Fill Transformations";
+ ot->idname = "GPENCIL_OT_reset_transform_fill";
ot->description = "Reset any UV transformation and back to default values";
/* callbacks */
- ot->exec = gpencil_reset_uv_transform_exec;
- ot->poll = gpencil_uv_transform_poll;
+ ot->exec = gpencil_reset_transform_fill_exec;
+ ot->poll = gpencil_transform_fill_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
More information about the Bf-blender-cvs
mailing list