[Bf-blender-cvs] [6bb897a76d9] custom-manipulators: Cleanup, rename callbacks

[Campbell Barton]

Commit: 6bb897a76d92c8a09140b26ee98cdaa10d633ec0
Author: Campbell Barton
Date:   Wed Jun 14 03:19:53 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB6bb897a76d92c8a09140b26ee98cdaa10d633ec0

Cleanup, rename callbacks

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

M	source/blender/editors/space_view3d/view3d_manipulators.c
M	source/blender/editors/transform/transform_manipulator.c

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

diff --git a/source/blender/editors/space_view3d/view3d_manipulators.c b/source/blender/editors/space_view3d/view3d_manipulators.c
index 2a0ba6bc469..551d7f7b7ef 100644
--- a/source/blender/editors/space_view3d/view3d_manipulators.c
+++ b/source/blender/editors/space_view3d/view3d_manipulators.c
@@ -309,7 +309,7 @@ static bool WIDGETGROUP_forcefield_poll(const bContext *C, wmManipulatorGroupTyp
 	return (ob && ob->pd && ob->pd->forcefield);
 }
 
-static void WIDGETGROUP_forcefield_init(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+static void WIDGETGROUP_forcefield_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
 {
 	const float col[4] = {0.8f, 0.8f, 0.45f, 0.5f};
 	const float col_hi[4] = {0.8f, 0.8f, 0.45f, 1.0f};
@@ -359,7 +359,7 @@ void VIEW3D_WGT_force_field(wmManipulatorGroupType *wgt)
 	              WM_MANIPULATORGROUPTYPE_3D);
 
 	wgt->poll = WIDGETGROUP_forcefield_poll;
-	wgt->setup = WIDGETGROUP_forcefield_init;
+	wgt->setup = WIDGETGROUP_forcefield_setup;
 	wgt->refresh = WIDGETGROUP_forcefield_refresh;
 }
 
@@ -457,7 +457,7 @@ static wmManipulator *armature_facemap_widget_create(wmManipulatorGroup *mgroup,
 	return widget;
 }
 
-static void WIDGETGROUP_armature_facemaps_init(const bContext *C, wmManipulatorGroup *mgroup)
+static void WIDGETGROUP_armature_facemaps_setup(const bContext *C, wmManipulatorGroup *mgroup)
 {
 	Object *ob = CTX_data_active_object(C);
 	bArmature *arm = (bArmature *)ob->data;
@@ -563,7 +563,7 @@ void VIEW3D_WGT_armature_facemaps(wmManipulatorGroupType *wgt)
 	              WM_MANIPULATORGROUPTYPE_SELECT);
 
 	wgt->poll = WIDGETGROUP_armature_facemaps_poll;
-	wgt->setup = WIDGETGROUP_armature_facemaps_init;
+	wgt->setup = WIDGETGROUP_armature_facemaps_setup;
 	wgt->refresh = WIDGETGROUP_armature_facemaps_refresh;
 
 	wgt->setup_keymap = WM_manipulatorgroup_keymap_common_select;
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index b705320879a..9655ee236b9 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1134,7 +1134,7 @@ static void manipulator_modal(
 	ED_region_tag_redraw(ar);
 }
 
-static void WIDGETGROUP_manipulator_init(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
+static void WIDGETGROUP_manipulator_setup(const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
 {
 	ManipulatorGroup *man = manipulatorgroup_init(mgroup);
 	mgroup->customdata = man;
@@ -1350,7 +1350,7 @@ void TRANSFORM_WGT_manipulator(wmManipulatorGroupType *wgt)
 	              WM_MANIPULATORGROUPTYPE_SCALE_3D);
 
 	wgt->poll = WIDGETGROUP_manipulator_poll;
-	wgt->setup = WIDGETGROUP_manipulator_init;
+	wgt->setup = WIDGETGROUP_manipulator_setup;
 	wgt->refresh = WIDGETGROUP_manipulator_refresh;
 	wgt->draw_prepare = WIDGETGROUP_manipulator_draw_prepare;
 }
@@ -1367,7 +1367,7 @@ static void WIDGETGROUP_object_manipulator_init(const bContext *C, wmManipulator
 		ob->mgroup = mgroup;
 	}
 
-	WIDGETGROUP_manipulator_init(C, mgroup);
+	WIDGETGROUP_manipulator_setup(C, mgroup);
 }
 
 static bool WIDGETGROUP_object_manipulator_poll(const bContext *C, wmManipulatorGroupType *wgt)