[Bf-blender-cvs] [fc06bd72361] blender2.8: Cleanup: use 'mesh' in preselect identifiers

Campbell Barton noreply at git.blender.org
Mon Sep 10 07:52:51 CEST 2018


Commit: fc06bd723617bb57e38c9cd1db247267246a07dc
Author: Campbell Barton
Date:   Mon Sep 10 14:44:15 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBfc06bd723617bb57e38c9cd1db247267246a07dc

Cleanup: use 'mesh' in preselect identifiers

We may have preselection for other types later.

===================================================================

M	source/blender/editors/space_view3d/view3d_gizmo_preselect.c
M	source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect.c
index e7a35c39bf3..3f022a83f34 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_preselect.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect.c
@@ -63,7 +63,7 @@ static bool WIDGETGROUP_mesh_preselect_elem_poll(const bContext *C, wmGizmoGroup
 
 static void WIDGETGROUP_mesh_preselect_elem_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup)
 {
-	const wmGizmoType *gzt_presel = WM_gizmotype_find("GIZMO_GT_preselect_elem_3d", true);
+	const wmGizmoType *gzt_presel = WM_gizmotype_find("GIZMO_GT_mesh_preselect_elem_3d", true);
 	struct GizmoGroupPreSelElem *man = MEM_callocN(sizeof(struct GizmoGroupPreSelElem), __func__);
 	gzgroup->customdata = man;
 
@@ -111,7 +111,7 @@ static bool WIDGETGROUP_mesh_preselect_edgering_poll(const bContext *C, wmGizmoG
 
 static void WIDGETGROUP_mesh_preselect_edgering_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup)
 {
-	const wmGizmoType *gzt_presel = WM_gizmotype_find("GIZMO_GT_preselect_edgering_3d", true);
+	const wmGizmoType *gzt_presel = WM_gizmotype_find("GIZMO_GT_mesh_preselect_edgering_3d", true);
 	struct GizmoGroupPreSelEdgeRing *man = MEM_callocN(sizeof(struct GizmoGroupPreSelEdgeRing), __func__);
 	gzgroup->customdata = man;
 
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
index 33de6621db3..0692c803904 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
@@ -233,10 +233,10 @@ static int gizmo_preselect_elem_invoke(
 	return OPERATOR_PASS_THROUGH;
 }
 
-static void GIZMO_GT_preselect_elem_3d(wmGizmoType *gzt)
+static void GIZMO_GT_mesh_preselect_elem_3d(wmGizmoType *gzt)
 {
 	/* identifiers */
-	gzt->idname = "GIZMO_GT_preselect_elem_3d";
+	gzt->idname = "GIZMO_GT_mesh_preselect_elem_3d";
 
 	/* api callbacks */
 	gzt->invoke = gizmo_preselect_elem_invoke;
@@ -394,10 +394,10 @@ static int gizmo_preselect_edgering_invoke(
 }
 
 
-static void GIZMO_GT_preselect_edgering_3d(wmGizmoType *gzt)
+static void GIZMO_GT_mesh_preselect_edgering_3d(wmGizmoType *gzt)
 {
 	/* identifiers */
-	gzt->idname = "GIZMO_GT_preselect_edgering_3d";
+	gzt->idname = "GIZMO_GT_mesh_preselect_edgering_3d";
 
 	/* api callbacks */
 	gzt->invoke = gizmo_preselect_edgering_invoke;
@@ -422,8 +422,8 @@ static void GIZMO_GT_preselect_edgering_3d(wmGizmoType *gzt)
 
 void ED_gizmotypes_preselect_3d(void)
 {
-	WM_gizmotype_append(GIZMO_GT_preselect_elem_3d);
-	WM_gizmotype_append(GIZMO_GT_preselect_edgering_3d);
+	WM_gizmotype_append(GIZMO_GT_mesh_preselect_elem_3d);
+	WM_gizmotype_append(GIZMO_GT_mesh_preselect_edgering_3d);
 }
 
 /** \} */



More information about the Bf-blender-cvs mailing list