[Bf-blender-cvs] [98bcc65543f] custom-manipulators: Edit to last commit, add string versions of add-remove

[Campbell Barton]

Commit: 98bcc65543f2783271cfcc0e74fd2210bc6a0a98
Author: Campbell Barton
Date:   Wed Jun 14 02:50:42 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB98bcc65543f2783271cfcc0e74fd2210bc6a0a98

Edit to last commit, add string versions of add-remove

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

M	source/blender/makesrna/intern/rna_wm_api.c
M	source/blender/makesrna/intern/rna_wm_manipulator.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/manipulators/WM_manipulator_api.h
M	source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c

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

diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index 565194e5712..166b6f96956 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -136,7 +136,7 @@ static void rna_manipulator_group_type_add(ReportList *reports, const char *idna
 {
 	wmManipulatorGroupType *wgt = wm_manipulatorgrouptype_find_for_add_remove(reports, idname);
 	if (wgt != NULL) {
-		WM_manipulator_group_add(wgt);
+		WM_manipulator_group_add_ptr(wgt);
 	}
 }
 
@@ -144,7 +144,7 @@ static void rna_manipulator_group_type_remove(Main *bmain, ReportList *reports,
 {
 	wmManipulatorGroupType *wgt = wm_manipulatorgrouptype_find_for_add_remove(reports, idname);
 	if (wgt != NULL) {
-		WM_manipulator_group_remove(bmain, wgt);
+		WM_manipulator_group_remove_ptr(bmain, wgt);
 	}
 }
 
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c b/source/blender/makesrna/intern/rna_wm_manipulator.c
index db4cedcf733..283af9ecc58 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator.c
+++ b/source/blender/makesrna/intern/rna_wm_manipulator.c
@@ -624,7 +624,7 @@ static StructRNA *rna_ManipulatorGroup_register(
 	        BPY_RNA_manipulatorgroup_wrapper, (void *)&dummywgt);
 
 	if (wgt->flag & WM_MANIPULATORGROUPTYPE_PERSISTENT) {
-		WM_manipulator_group_add_ex(wgt, mmap_type);
+		WM_manipulator_group_add_ptr_ex(wgt, mmap_type);
 
 		/* update while blender is running */
 		WM_main_add_notifier(NC_SCREEN | NA_EDITED, NULL);
@@ -644,7 +644,7 @@ static void rna_ManipulatorGroup_unregister(struct Main *bmain, StructRNA *type)
 
 	RNA_struct_free_extension(type, &wgt->ext);
 
-	WM_manipulator_group_remove(bmain, wgt);
+	WM_manipulator_group_remove_ptr(bmain, wgt);
 
 	RNA_struct_free(&BLENDER_RNA, type);
 }
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index f925f22e878..8d1ed75e01b 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -118,6 +118,8 @@
 #include "wm_subwindow.h"
 #include "wm_window.h"
 
+#include "WM_manipulator_api.h"
+
 static GHash *global_ops_hash = NULL;
 
 #define UNDOCUMENTED_OPERATOR_TIP N_("(undocumented operator)")
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 69c7c645fd3..6cd6ae70783 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -167,16 +167,18 @@ void WM_manipulatormaptype_group_free(struct wmManipulatorGroupTypeRef *wgt);
 /* -------------------------------------------------------------------- */
 /* Manipulator Add/Remove (High level API) */
 
-void WM_manipulator_group_add_ex(
+void WM_manipulator_group_add_ptr_ex(
         struct wmManipulatorGroupType *wgt,
         struct wmManipulatorMapType *mmap_type);
-void WM_manipulator_group_add(
+void WM_manipulator_group_add_ptr(
         struct wmManipulatorGroupType *wgt);
+void WM_manipulator_group_add(const char *idname);
 
-void WM_manipulator_group_remove_ex(
+void WM_manipulator_group_remove_ptr_ex(
         struct Main *bmain, struct wmManipulatorGroupType *wgt,
         struct wmManipulatorMapType *mmap_type);
-void WM_manipulator_group_remove(
+void WM_manipulator_group_remove_ptr(
         struct Main *bmain, struct wmManipulatorGroupType *wgt);
+void WM_manipulator_group_remove(struct Main *bmain, const char *idname);
 
 #endif  /* __WM_MANIPULATOR_API_H__ */
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
index f20591910f7..e667929a928 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
@@ -632,7 +632,7 @@ void wm_manipulatorgrouptype_setup_keymap(
  *
  * \{ */
 
-void WM_manipulator_group_add_ex(
+void WM_manipulator_group_add_ptr_ex(
         wmManipulatorGroupType *wgt,
         wmManipulatorMapType *mmap_type)
 {
@@ -641,26 +641,39 @@ void WM_manipulator_group_add_ex(
 	WM_manipulatorconfig_update_tag_init(mmap_type, wgt);
 }
 
-void WM_manipulator_group_add(
+void WM_manipulator_group_add_ptr(
         wmManipulatorGroupType *wgt)
 {
 	wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(&wgt->mmap_params);
-	WM_manipulator_group_add_ex(wgt, mmap_type);
+	WM_manipulator_group_add_ptr_ex(wgt, mmap_type);
 }
 
-void WM_manipulator_group_remove_ex(
+void WM_manipulator_group_add(const char *idname)
+{
+	wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_find(idname, false);
+	BLI_assert(wgt != NULL);
+	WM_manipulator_group_add_ptr(wgt);
+}
+
+void WM_manipulator_group_remove_ptr_ex(
         struct Main *bmain, wmManipulatorGroupType *wgt,
         wmManipulatorMapType *mmap_type)
 {
 	WM_manipulatormaptype_group_unlink(NULL, bmain, mmap_type, wgt);
 }
 
-void WM_manipulator_group_remove(
+void WM_manipulator_group_remove_ptr(
         struct Main *bmain, wmManipulatorGroupType *wgt)
 {
 	wmManipulatorMapType *mmap_type = WM_manipulatormaptype_ensure(&wgt->mmap_params);
-	WM_manipulator_group_remove_ex(bmain, wgt, mmap_type);
+	WM_manipulator_group_remove_ptr_ex(bmain, wgt, mmap_type);
 }
 
+void WM_manipulator_group_remove(struct Main *bmain, const char *idname)
+{
+	wmManipulatorGroupType *wgt = WM_manipulatorgrouptype_find(idname, false);
+	BLI_assert(wgt != NULL);
+	WM_manipulator_group_remove_ptr(bmain, wgt);
+}
 
 /** \} */