From 7f480352caaa14a20c0438ae0ed1c2607b6c2c00 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 8 Jun 2017 07:16:47 +1000 Subject: WM: move manipulator library into editors As with operators, the window-manager has the API for defining, the editor can implement and register its own manipulators. This exposes wmManipulator, keeping it opaque isn't practical if editors and Python are to implement their own. --- source/blender/editors/space_api/spacetypes.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'source/blender/editors/space_api/spacetypes.c') diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c index acc197bcc5b..16ccf1da916 100644 --- a/source/blender/editors/space_api/spacetypes.c +++ b/source/blender/editors/space_api/spacetypes.c @@ -66,6 +66,7 @@ #include "ED_clip.h" #include "ED_mask.h" #include "ED_sequencer.h" +#include "ED_manipulator_library.h" #include "io_ops.h" @@ -126,20 +127,11 @@ void ED_spacetypes_init(void) 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_dial_3d(); ED_manipulatortypes_arrow_2d(); ED_manipulatortypes_arrow_3d(); - ED_manipulatortypes_primitive(); - ED_manipulatortypes_cage(); + ED_manipulatortypes_primitive_3d(); + ED_manipulatortypes_cage_2d(); /* register types for operators and manipulators */ spacetypes = BKE_spacetypes_list(); -- cgit v1.2.3