[Bf-blender-cvs] [bf26509855c] blender2.8: Manipulator: name remove func's 'unlink_delayed'

[Campbell Barton]

Commit: bf26509855cf042375c44cbe729cd0e5262bb519
Author: Campbell Barton
Date:   Sun Oct 22 00:17:47 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBbf26509855cf042375c44cbe729cd0e5262bb519

Manipulator: name remove func's 'unlink_delayed'

Name wasn't right since this only unlinks from manipulator maps.

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

M	source/blender/editors/mesh/editmesh_bisect.c
M	source/blender/editors/mesh/editmesh_extrude.c
M	source/blender/editors/transform/transform_manipulator.c
M	source/blender/windowmanager/manipulators/WM_manipulator_api.h
M	source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c

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

diff --git a/source/blender/editors/mesh/editmesh_bisect.c b/source/blender/editors/mesh/editmesh_bisect.c
index ca84de74b3d..1937a9f6891 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -596,7 +596,7 @@ static bool manipulator_mesh_bisect_poll(const bContext *C, wmManipulatorGroupTy
 {
 	wmOperator *op = WM_operator_last_redo(C);
 	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_bisect")) {
-		WM_manipulator_group_type_remove_ptr_delayed(wgt);
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
 		return false;
 	}
 	return true;
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c
index f6db7a48108..18320ec65f5 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -1063,7 +1063,7 @@ static bool manipulator_mesh_spin_poll(const bContext *C, wmManipulatorGroupType
 {
 	wmOperator *op = WM_operator_last_redo(C);
 	if (op == NULL || !STREQ(op->type->idname, "MESH_OT_spin")) {
-		WM_manipulator_group_type_remove_ptr_delayed(wgt);
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
 		return false;
 	}
 	return true;
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 0eae89266ef..a540fe58877 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1463,7 +1463,7 @@ static bool WIDGETGROUP_xform_cage_poll(const bContext *C, wmManipulatorGroupTyp
 {
 	WorkSpace *workspace = CTX_wm_workspace(C);
 	if (!STREQ(wgt->idname, workspace->tool.manipulator_group)) {
-		WM_manipulator_group_type_remove_ptr_delayed(wgt);
+		WM_manipulator_group_type_unlink_delayed_ptr(wgt);
 		return false;
 	}
 	return true;
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 14cc5e9f137..afc39fe1005 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -297,12 +297,12 @@ void WM_manipulator_group_type_remove_ptr(
         struct Main *bmain, struct wmManipulatorGroupType *wgt);
 void WM_manipulator_group_type_remove(struct Main *bmain, const char *idname);
 
-void WM_manipulator_group_type_remove_ptr_delayed_ex(
+void WM_manipulator_group_type_unlink_delayed_ptr_ex(
         struct wmManipulatorGroupType *wgt,
         struct wmManipulatorMapType *mmap_type);
-void WM_manipulator_group_type_remove_ptr_delayed(
+void WM_manipulator_group_type_unlink_delayed_ptr(
         struct wmManipulatorGroupType *wgt);
-void WM_manipulator_group_type_remove_delayed(const char *idname);
+void WM_manipulator_group_type_unlink_delayed(const char *idname);
 
 /* Utilities */
 void WM_manipulator_group_type_is_any_selected(const char *idname);
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index cc902f2acdb..24786695cba 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -757,25 +757,25 @@ void WM_manipulator_group_type_remove(struct Main *bmain, const char *idname)
 
 /* delayed versions */
 
-void WM_manipulator_group_type_remove_ptr_delayed_ex(
+void WM_manipulator_group_type_unlink_delayed_ptr_ex(
         wmManipulatorGroupType *wgt,
         wmManipulatorMapType *mmap_type)
 {
 	WM_manipulatorconfig_update_tag_remove(mmap_type, wgt);
 }
 
-void WM_manipulator_group_type_remove_ptr_delayed(
+void WM_manipulator_group_type_unlink_delayed_ptr(
         wmManipulatorGroupType *wgt)
 {
 	wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(&wgt->mmap_params);
-	WM_manipulator_group_type_remove_ptr_delayed_ex(wgt, mmap_type);
+	WM_manipulator_group_type_unlink_delayed_ptr_ex(wgt, mmap_type);
 }
 
-void WM_manipulator_group_type_remove_delayed(const char *idname)
+void WM_manipulator_group_type_unlink_delayed(const char *idname)
 {
 	wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_find(idname, false);
 	BLI_assert(wgt != NULL);
-	WM_manipulator_group_type_remove_ptr_delayed(wgt);
+	WM_manipulator_group_type_unlink_delayed_ptr(wgt);
 }
 
 /** \} */