From 2ca7d148142865c2f8e1571aef88296e9d7f0007 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Sep 2018 09:58:27 +1000 Subject: Cleanup: spin redo naming changes --- source/blender/editors/mesh/editmesh_extrude_spin.c | 4 ++-- source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c | 6 +++--- source/blender/editors/mesh/mesh_intern.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.c b/source/blender/editors/mesh/editmesh_extrude_spin.c index 87814bc44c6..12a01b43f99 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin.c @@ -146,7 +146,7 @@ static int edbm_spin_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e if (ret & OPERATOR_FINISHED) { /* Setup gizmos */ if (v3d && ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0)) { - wmGizmoGroupType *gzgt = WM_gizmogrouptype_find("MESH_GGT_spin", false); + wmGizmoGroupType *gzgt = WM_gizmogrouptype_find("MESH_GGT_spin_redo", false); if (!WM_gizmo_group_type_ensure_ptr(gzgt)) { struct Main *bmain = CTX_data_main(C); WM_gizmo_group_type_reinit_ptr(bmain, gzgt); @@ -187,6 +187,6 @@ void MESH_OT_spin(wmOperatorType *ot) RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis", "Axis in global view space", -1.0f, 1.0f); #ifdef USE_GIZMO - WM_gizmogrouptype_append(MESH_GGT_spin); + WM_gizmogrouptype_append(MESH_GGT_spin_redo); #endif } diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c index 1bcc4df57a4..1cadb07a025 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c +++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c @@ -412,10 +412,10 @@ static void gizmo_mesh_spin_draw_prepare( gizmo_mesh_spin_update_from_op(ggd); } -void MESH_GGT_spin(struct wmGizmoGroupType *gzgt) +void MESH_GGT_spin_redo(struct wmGizmoGroupType *gzgt) { - gzgt->name = "Mesh Spin"; - gzgt->idname = "MESH_GGT_spin"; + gzgt->name = "Mesh Spin Redo"; + gzgt->idname = "MESH_GGT_spin_redo"; gzgt->flag = WM_GIZMOGROUPTYPE_3D; diff --git a/source/blender/editors/mesh/mesh_intern.h b/source/blender/editors/mesh/mesh_intern.h index b4835f30bcb..8d5f1ebdb1d 100644 --- a/source/blender/editors/mesh/mesh_intern.h +++ b/source/blender/editors/mesh/mesh_intern.h @@ -116,7 +116,7 @@ void MESH_OT_screw(struct wmOperatorType *ot); /* *** editmesh_extrude_spin.c *** */ void MESH_OT_spin(struct wmOperatorType *ot); /* *** editmesh_extrude_spin_gizmo.c *** */ -void MESH_GGT_spin(struct wmGizmoGroupType *gzgt); +void MESH_GGT_spin_redo(struct wmGizmoGroupType *gzgt); /* *** editmesh_polybuild.c *** */ void MESH_OT_polybuild_face_at_cursor(struct wmOperatorType *ot); -- cgit v1.2.3