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:
authorCampbell Barton <ideasman42@gmail.com>2018-11-21 01:25:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-21 01:25:55 +0300
commit6aa7cea3c28d5c79867ba64e4bcef8c5c6ef871e (patch)
tree615f3347dc1df146ad95dcbf50aa5b26d3750d96
parentd3a75c48fdb06f7c127fd25544b641dfe44d9f01 (diff)
Cleanup: rename extrude gizmo
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py16
-rw-r--r--source/blender/editors/include/ED_transform.h2
-rw-r--r--source/blender/editors/space_view3d/space_view3d.c2
-rw-r--r--source/blender/editors/transform/transform_gizmo_extrude_3d.c6
4 files changed, 13 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index c97a72a95c4..3c3d43ac8bd 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -65,10 +65,10 @@ def generate_from_enum_ex(
# Use for shared widget data.
class _template_widget:
- class MESH_GGT_extrude:
+ class VIEW3D_GGT_xform_extrude:
@staticmethod
def draw_settings(context, layout, tool):
- props = tool.gizmo_group_properties("MESH_GGT_extrude")
+ props = tool.gizmo_group_properties("VIEW3D_GGT_xform_extrude")
layout.prop(props, "axis_type", expand=True)
@@ -364,9 +364,9 @@ class _defs_edit_armature:
return dict(
text="Extrude",
icon="ops.armature.extrude_move",
- widget="MESH_GGT_extrude",
+ widget="VIEW3D_GGT_xform_extrude",
keymap=(),
- draw_settings=_template_widget.MESH_GGT_extrude.draw_settings,
+ draw_settings=_template_widget.VIEW3D_GGT_xform_extrude.draw_settings,
)
@ToolDef.from_fn
@@ -526,11 +526,11 @@ class _defs_edit_mesh:
"Extrude freely or along an axis"
),
icon="ops.mesh.extrude_region_move",
- widget="MESH_GGT_extrude",
+ widget="VIEW3D_GGT_xform_extrude",
# Important to use same operator as 'E' key.
operator="view3d.edit_mesh_extrude_move_normal",
keymap=(),
- draw_settings=_template_widget.MESH_GGT_extrude.draw_settings,
+ draw_settings=_template_widget.VIEW3D_GGT_xform_extrude.draw_settings,
)
@ToolDef.from_fn
@@ -740,9 +740,9 @@ class _defs_edit_curve:
return dict(
text="Extrude",
icon="ops.curve.extrude_move",
- widget="MESH_GGT_extrude",
+ widget="VIEW3D_GGT_xform_extrude",
keymap=(),
- draw_settings=_template_widget.MESH_GGT_extrude.draw_settings,
+ draw_settings=_template_widget.VIEW3D_GGT_xform_extrude.draw_settings,
)
@ToolDef.from_fn
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index c53dd2a8e96..dd17fa6f434 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -167,7 +167,7 @@ void VIEW3D_GGT_xform_cage(struct wmGizmoGroupType *gzgt);
void VIEW3D_GGT_xform_shear(struct wmGizmoGroupType *gzgt);
/* *** transform_gizmo_extrude_3d.c *** */
-void MESH_GGT_extrude(struct wmGizmoGroupType *gzgt);
+void VIEW3D_GGT_xform_extrude(struct wmGizmoGroupType *gzgt);
bool ED_widgetgroup_gizmo2d_poll(const struct bContext *C, struct wmGizmoGroupType *gzgt);
void ED_widgetgroup_gizmo2d_setup(const struct bContext *C, struct wmGizmoGroup *gzgroup);
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index e7c1a0a3105..91b13e1ac87 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -704,9 +704,9 @@ static void view3d_widgets(void)
WM_gizmogrouptype_append(TRANSFORM_GGT_gizmo);
WM_gizmogrouptype_append(VIEW3D_GGT_xform_cage);
WM_gizmogrouptype_append(VIEW3D_GGT_xform_shear);
+ WM_gizmogrouptype_append(VIEW3D_GGT_xform_extrude);
WM_gizmogrouptype_append(VIEW3D_GGT_mesh_preselect_elem);
WM_gizmogrouptype_append(VIEW3D_GGT_mesh_preselect_edgering);
- WM_gizmogrouptype_append(MESH_GGT_extrude);
WM_gizmogrouptype_append(VIEW3D_GGT_ruler);
WM_gizmotype_append(VIEW3D_GT_ruler_item);
diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c
index 171f7d77653..8a596d5e613 100644
--- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c
@@ -393,10 +393,10 @@ static void gizmo_mesh_extrude_message_subscribe(
&msg_sub_value_gz_tag_refresh, __func__);
}
-void MESH_GGT_extrude(struct wmGizmoGroupType *gzgt)
+void VIEW3D_GGT_xform_extrude(struct wmGizmoGroupType *gzgt)
{
- gzgt->name = "Mesh Extrude";
- gzgt->idname = "MESH_GGT_extrude";
+ gzgt->name = "3D View Extrude";
+ gzgt->idname = "VIEW3D_GGT_xform_extrude";
gzgt->flag = WM_GIZMOGROUPTYPE_3D;