[Bf-blender-cvs] [2ca7d148142] blender2.8: Cleanup: spin redo naming changes
Campbell Barton
noreply at git.blender.org
Tue Sep 18 01:46:57 CEST 2018
Commit: 2ca7d148142865c2f8e1571aef88296e9d7f0007
Author: Campbell Barton
Date: Tue Sep 18 09:58:27 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB2ca7d148142865c2f8e1571aef88296e9d7f0007
Cleanup: spin redo naming changes
===================================================================
M source/blender/editors/mesh/editmesh_extrude_spin.c
M source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
M source/blender/editors/mesh/mesh_intern.h
===================================================================
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);
More information about the Bf-blender-cvs
mailing list