[Bf-blender-cvs] [44a86160842] custom-manipulators: Rename RNA wrapper calls

[Campbell Barton]

Commit: 44a8616084207be92bd8458eddd536a3592464a6
Author: Campbell Barton
Date:   Fri Jun 9 07:39:37 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB44a8616084207be92bd8458eddd536a3592464a6

Rename RNA wrapper calls

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

M	source/blender/makesrna/intern/rna_wm_manipulator.c
M	source/blender/python/intern/bpy_manipulator_wrap.c
M	source/blender/python/intern/bpy_manipulator_wrap.h

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

diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c b/source/blender/makesrna/intern/rna_wm_manipulator.c
index d134f4cd7af..a2fbe5c8376 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator.c
+++ b/source/blender/makesrna/intern/rna_wm_manipulator.c
@@ -253,7 +253,7 @@ static void rna_Manipulator_color_hi_set(PointerRNA *ptr, const float *values)
 }
 
 static void rna_Manipulator_unregister(struct Main *bmain, StructRNA *type);
-void manipulator_wrapper(wmManipulatorType *wgt, void *userdata);
+void BPY_RNA_manipulator_wrapper(wmManipulatorType *wgt, void *userdata);
 
 static StructRNA *rna_Manipulator_register(
         Main *bmain, ReportList *reports, void *data, const char *identifier,
@@ -324,7 +324,7 @@ static StructRNA *rna_Manipulator_register(
 	/* use duplicated string */
 	dummywt.idname = dummywt.ext.srna->identifier;
 
-	WM_manipulatortype_append_ptr(manipulator_wrapper, (void *)&dummywt);
+	WM_manipulatortype_append_ptr(BPY_RNA_manipulator_wrapper, (void *)&dummywt);
 
 	/* update while blender is running */
 	WM_main_add_notifier(NC_SCREEN | NA_EDITED, NULL);
@@ -506,7 +506,7 @@ static wmKeyMap *rna_manipulatorgroup_setup_keymap_cb(const wmManipulatorGroupTy
 	return keymap;
 }
 
-void manipulatorgroup_wrapper(wmManipulatorGroupType *wgt, void *userdata);
+void BPY_RNA_manipulatorgroup_wrapper(wmManipulatorGroupType *wgt, void *userdata);
 
 static StructRNA *rna_ManipulatorGroup_register(
         Main *bmain, ReportList *reports, void *data, const char *identifier,
@@ -583,7 +583,7 @@ static StructRNA *rna_ManipulatorGroup_register(
 	dummywgt.idname = dummywgt.ext.srna->identifier;
 	dummywgt.name = dummywgt.ext.srna->name;
 
-	WM_manipulatorgrouptype_append_ptr(wmaptype, manipulatorgroup_wrapper, (void *)&dummywgt);
+	WM_manipulatorgrouptype_append_ptr(wmaptype, BPY_RNA_manipulatorgroup_wrapper, (void *)&dummywgt);
 
 	/* TODO: WM_manipulatorgrouptype_init_runtime */
 
diff --git a/source/blender/python/intern/bpy_manipulator_wrap.c b/source/blender/python/intern/bpy_manipulator_wrap.c
index 2ab857c882b..cbf8d49d828 100644
--- a/source/blender/python/intern/bpy_manipulator_wrap.c
+++ b/source/blender/python/intern/bpy_manipulator_wrap.c
@@ -75,7 +75,7 @@ static void manipulator_properties_init(wmManipulatorType *wt)
 #endif
 }
 
-void manipulator_wrapper(wmManipulatorType *wt, void *userdata)
+void BPY_RNA_manipulator_wrapper(wmManipulatorType *wt, void *userdata)
 {
 	/* take care not to overwrite anything set in
 	 * WM_manipulatorgrouptype_append_ptr before opfunc() is called */
@@ -127,7 +127,7 @@ static void manipulatorgroup_properties_init(wmManipulatorGroupType *wgt)
 #endif
 }
 
-void manipulatorgroup_wrapper(wmManipulatorGroupType *wgt, void *userdata)
+void BPY_RNA_manipulatorgroup_wrapper(wmManipulatorGroupType *wgt, void *userdata)
 {
 	/* take care not to overwrite anything set in
 	 * WM_manipulatorgrouptype_append_ptr before opfunc() is called */
diff --git a/source/blender/python/intern/bpy_manipulator_wrap.h b/source/blender/python/intern/bpy_manipulator_wrap.h
index 7bca79c6056..59dca502e8e 100644
--- a/source/blender/python/intern/bpy_manipulator_wrap.h
+++ b/source/blender/python/intern/bpy_manipulator_wrap.h
@@ -28,8 +28,8 @@
 struct wmManipulatorGroupType;
 
 /* exposed to rna/wm api */
-void manipulator_wrapper(struct wmManipulatorType *wt, void *userdata);
-void manipulatorgroup_wrapper(struct wmManipulatorGroupType *wgt, void *userdata);
+void BPY_RNA_manipulator_wrapper(struct wmManipulatorType *wt, void *userdata);
+void BPY_RNA_manipulatorgroup_wrapper(struct wmManipulatorGroupType *wgt, void *userdata);
 
 #endif  /* __BPY_MANIPULATOR_WRAP_H__ */