[Bf-blender-cvs] [d4f3278] temp_manipulators_core: Fixes for custom-manipulators branch

[Julian Eisel]

Commit: d4f327896274b3f4995af3d0beb8c0cf0f36b803
Author: Julian Eisel
Date:   Mon Oct 3 00:52:41 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rBd4f327896274b3f4995af3d0beb8c0cf0f36b803

Fixes for custom-manipulators branch

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
M	source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
index a938e8b..c2780d3 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
@@ -58,23 +58,16 @@
 #include "wm_manipulator_intern.h"
 
 
-/* wmManipulatorGroupType.flag_intern */
-enum {
-	/* manipulator group is attached to operator, and is only accessible as long as this runs */
-	WM_MANIPULATORGROUPTYPE_OP      = (1 << 0),
-};
+/* -------------------------------------------------------------------- */
+/** \name wmManipulatorGroup
+ *
+ * \{ */
 
 /* wmManipulatorGroup.flag */
 enum {
 	WM_MANIPULATORGROUP_INITIALIZED = (1 << 2), /* mgroup has been initialized */
 };
 
-
-/* -------------------------------------------------------------------- */
-/** \name wmManipulatorGroup
- *
- * \{ */
-
 /**
  * Create a new manipulator-group from \a mgrouptype.
  */
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h b/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
index cff0bca..7684b3a 100644
--- a/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
+++ b/source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
@@ -55,6 +55,12 @@ struct wmManipulatorGroup *wm_manipulator_group_find(
 /* -------------------------------------------------------------------- */
 /* wmManipulatorGroup */
 
+/* wmManipulatorGroupType.flag */
+enum {
+	/* manipulator group is attached to operator, and is only accessible as long as this runs */
+	WM_MANIPULATORGROUPTYPE_OP = (1 << 0),
+};
+
 void MANIPULATORGROUP_OT_manipulator_select(struct wmOperatorType *ot);
 void MANIPULATORGROUP_OT_manipulator_tweak(struct wmOperatorType *ot);
 
@@ -65,7 +71,7 @@ void  wm_manipulatorgroup_attach_to_modal_handler(
 /* -------------------------------------------------------------------- */
 /* wmManipulatorMap */
 
-void wm_manipulatormap_delete(wmManipulatorMap *mmap);
+void wm_manipulatormap_delete(struct wmManipulatorMap *mmap);
 void wm_manipulatormaptypes_free(void);
 
 void wm_manipulators_keymap(struct wmKeyConfig *keyconf);