[Bf-blender-cvs] [b93e52d7522] custom-manipulators: Missed last commit

[Campbell Barton]

Commit: b93e52d7522e1d7ec1345718fb05d76e82e9bda9
Author: Campbell Barton
Date:   Fri Jun 9 15:55:27 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBb93e52d7522e1d7ec1345718fb05d76e82e9bda9

Missed last commit

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

M	source/blender/windowmanager/manipulators/WM_manipulator_types.h
M	source/blender/windowmanager/manipulators/wm_manipulator_fn.h

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

diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_types.h b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
index 1115939301c..421c975d04d 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
@@ -146,7 +146,7 @@ typedef struct wmManipulatorType {
 	wmManipulatorFnDrawSelect draw_select;
 
 	/* determine if the mouse intersects with the manipulator. The calculation should be done in the callback itself */
-	wmManipulatorFnIntersect test_select;
+	wmManipulatorFnTestSelect test_select;
 
 	/* handler used by the manipulator. Usually handles interaction tied to a manipulator type */
 	wmManipulatorFnModal modal;
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h b/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
index 879ef0fb94b..7c0c48f7f41 100644
--- a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
+++ b/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
@@ -39,7 +39,7 @@ typedef void (*wmManipulatorGroupFnDrawPrepare)(const struct bContext *, struct
 /* See: wmManipulatorType for docs on each type. */
 typedef void    (*wmManipulatorFnDraw)(const struct bContext *, struct wmManipulator *);
 typedef void    (*wmManipulatorFnDrawSelect)(const struct bContext *, struct wmManipulator *, int);
-typedef int     (*wmManipulatorFnIntersect)(struct bContext *, struct wmManipulator *, const struct wmEvent *);
+typedef int     (*wmManipulatorFnTestSelect)(struct bContext *, struct wmManipulator *, const struct wmEvent *);
 typedef void    (*wmManipulatorFnModal)(struct bContext *, struct wmManipulator *, const struct wmEvent *, const int);
 typedef void    (*wmManipulatorFnPropDataUpdate)(struct wmManipulator *, int);
 typedef void    (*wmManipulatorFnPositionGet)(struct wmManipulator *, float[]);