diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-06 15:14:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-06 15:16:12 +0300 |
commit | d220e54f281ebf4b851059f96b1190252489e103 (patch) | |
tree | abb8cd73e84051ce95459abf489cbbb2a5f4eaef /source/blender/windowmanager/manipulators/wm_manipulator_fn.h | |
parent | d267d76540d0adecee75346d6cfe2fa6a69478c8 (diff) |
WM: manipulator callback arg order
Use same arg order for C & RNA
Diffstat (limited to 'source/blender/windowmanager/manipulators/wm_manipulator_fn.h')
-rw-r--r-- | source/blender/windowmanager/manipulators/wm_manipulator_fn.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h b/source/blender/windowmanager/manipulators/wm_manipulator_fn.h index 99ef75d21ea..b2676d79646 100644 --- a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h +++ b/source/blender/windowmanager/manipulators/wm_manipulator_fn.h @@ -24,7 +24,6 @@ * Callback function definitions, needed for both Types & API headers. */ - #ifndef __WM_MANIPULATOR_FN_H__ #define __WM_MANIPULATOR_FN_H__ @@ -39,11 +38,11 @@ typedef void (*wmManipulatorGroupFnDrawPrepare)(const struct bContext *, struct /* wmManipulator */ typedef void (*wmManipulatorFnDraw)(const struct bContext *, struct wmManipulator *); typedef void (*wmManipulatorFnDrawSelect)(const struct bContext *, struct wmManipulator *, int); -typedef int (*wmManipulatorFnIntersect)(struct bContext *, const struct wmEvent *, struct wmManipulator *); -typedef int (*wmManipulatorFnHandler)(struct bContext *, const struct wmEvent *, struct wmManipulator *, const int); +typedef int (*wmManipulatorFnIntersect)(struct bContext *, struct wmManipulator *, const struct wmEvent *); +typedef int (*wmManipulatorFnHandler)(struct bContext *, struct wmManipulator *, const struct wmEvent *, const int); typedef void (*wmManipulatorFnPropDataUpdate)(struct wmManipulator *, int); typedef void (*wmManipulatorFnFinalPositionGet)(struct wmManipulator *, float[]); -typedef int (*wmManipulatorFnInvoke)(struct bContext *, const struct wmEvent *, struct wmManipulator *); +typedef int (*wmManipulatorFnInvoke)(struct bContext *, struct wmManipulator *, const struct wmEvent *); typedef void (*wmManipulatorFnExit)(struct bContext *, struct wmManipulator *, const bool); typedef int (*wmManipulatorFnCursorGet)(struct wmManipulator *); typedef void (*wmManipulatorFnSelect)(struct bContext *, struct wmManipulator *, const int); |