diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-07 22:27:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-07 22:30:21 +0300 |
| commit | 575db256dbb54cc013c729157115ba4be8c7b13e (patch) | |
| tree | 39fdc86e417a6ebc0ab0e47400074aa98f86378a /source/blender/editors | |
| parent | 8ff1bce40f3de5272eb3cb6475691f0d8d98bc52 (diff) | |
WM: add wmManipulatorType, from wmManipulator
Having the type in mixed in with each instance
made it hard to expose types to RNA/Python.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_api/spacetypes.c | 16 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index 3a431eb82df..acc197bcc5b 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -125,6 +125,22 @@ void ED_spacetypes_init(void) ED_operatortypes_view2d(); ED_operatortypes_ui(); + /* manipulator types */ + + /* FIXME */ + extern void ED_manipulatortypes_dial(void); + extern void ED_manipulatortypes_arrow_2d(void); + extern void ED_manipulatortypes_arrow_3d(void); + extern void ED_manipulatortypes_facemap(void); + extern void ED_manipulatortypes_primitive(void); + extern void ED_manipulatortypes_cage(void); + + ED_manipulatortypes_dial(); + ED_manipulatortypes_arrow_2d(); + ED_manipulatortypes_arrow_3d(); + ED_manipulatortypes_primitive(); + ED_manipulatortypes_cage(); + /* register types for operators and manipulators */ spacetypes = BKE_spacetypes_list(); for (type = spacetypes->first; type; type = type->next) { diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index d1c8c08ec88..6d38037ab30 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1149,7 +1149,7 @@ static void WIDGETGROUP_manipulator_init(const bContext *UNUSED(C), wmManipulato manipulator_get_axis_constraint(axis_idx, constraint_axis); /* custom handler! */ - WM_manipulator_set_fn_handler(axis, manipulator_handler); + WM_manipulator_set_fn_custom_handler(axis, manipulator_handler); switch(axis_idx) { case MAN_AXIS_TRANS_X: |