diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-21 09:21:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-21 09:24:16 +0300 |
commit | c3a8b51413b61c7dca787a8a1b327e9f69dd2be3 (patch) | |
tree | 858da0caff1404d95d3942fd6faf6ad7974a8300 /source | |
parent | b7669ac1c672a92f31735ae9f92b369f9ba30eb1 (diff) |
Manipulator: Move types into their own directory
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/manipulator_library/CMakeLists.txt | 23 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c (renamed from source/blender/editors/manipulator_library/geom_arrow_manipulator.c) | 2 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c (renamed from source/blender/editors/manipulator_library/geom_cube_manipulator.c) | 2 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c (renamed from source/blender/editors/manipulator_library/geom_dial_manipulator.c) | 2 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c (renamed from source/blender/editors/manipulator_library/arrow2d_manipulator.c) | 4 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c (renamed from source/blender/editors/manipulator_library/arrow3d_manipulator.c) | 6 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c (renamed from source/blender/editors/manipulator_library/cage2d_manipulator.c) | 2 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c (renamed from source/blender/editors/manipulator_library/dial3d_manipulator.c) | 6 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c (renamed from source/blender/editors/manipulator_library/grab3d_manipulator.c) | 4 | ||||
-rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c (renamed from source/blender/editors/manipulator_library/primitive3d_manipulator.c) | 6 |
10 files changed, 28 insertions, 29 deletions
diff --git a/source/blender/editors/manipulator_library/CMakeLists.txt b/source/blender/editors/manipulator_library/CMakeLists.txt index 6421cfddadf..0604946dc24 100644 --- a/source/blender/editors/manipulator_library/CMakeLists.txt +++ b/source/blender/editors/manipulator_library/CMakeLists.txt @@ -37,21 +37,20 @@ set(INC_SYS ) set(SRC - arrow2d_manipulator.c - arrow3d_manipulator.c - cage2d_manipulator.c - dial3d_manipulator.c - grab3d_manipulator.c - geom_arrow_manipulator.c - geom_cube_manipulator.c - geom_dial_manipulator.c manipulator_draw_utils.c - manipulator_library_presets.c - manipulator_library_utils.c - primitive3d_manipulator.c - manipulator_geometry.h manipulator_library_intern.h + manipulator_library_presets.c + manipulator_library_utils.c + geometry/geom_arrow_manipulator.c + geometry/geom_cube_manipulator.c + geometry/geom_dial_manipulator.c + manipulator_types/arrow2d_manipulator.c + manipulator_types/arrow3d_manipulator.c + manipulator_types/cage2d_manipulator.c + manipulator_types/dial3d_manipulator.c + manipulator_types/grab3d_manipulator.c + manipulator_types/primitive3d_manipulator.c ) add_definitions(${GL_DEFINITIONS}) diff --git a/source/blender/editors/manipulator_library/geom_arrow_manipulator.c b/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c index 73518e5ac38..34f7d73589c 100644 --- a/source/blender/editors/manipulator_library/geom_arrow_manipulator.c +++ b/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c @@ -25,7 +25,7 @@ * \ingroup wm */ -#include "manipulator_geometry.h" +#include "../manipulator_geometry.h" static float verts[][3] = { {-0.000000, 0.012320, 0.000000}, diff --git a/source/blender/editors/manipulator_library/geom_cube_manipulator.c b/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c index a79d9161e96..cee8e1e22ee 100644 --- a/source/blender/editors/manipulator_library/geom_cube_manipulator.c +++ b/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c @@ -27,7 +27,7 @@ * \ingroup wm */ -#include "manipulator_geometry.h" +#include "../manipulator_geometry.h" static const float verts[][3] = { {1.000000, 1.000000, -1.000000}, diff --git a/source/blender/editors/manipulator_library/geom_dial_manipulator.c b/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c index dbabe7ad136..811fc872a81 100644 --- a/source/blender/editors/manipulator_library/geom_dial_manipulator.c +++ b/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c @@ -25,7 +25,7 @@ * \ingroup wm */ -#include "manipulator_geometry.h" +#include "../manipulator_geometry.h" static const float verts[][3] = { {1.034000, 0.000000, 0.000000}, diff --git a/source/blender/editors/manipulator_library/arrow2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c index adc23667d58..fd8745577cf 100644 --- a/source/blender/editors/manipulator_library/arrow2d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c @@ -58,7 +58,7 @@ /* own includes */ #include "WM_api.h" -#include "manipulator_library_intern.h" +#include "../manipulator_library_intern.h" static void arrow2d_draw_geom(wmManipulator *mpr, const float matrix[4][4], const float color[4]) { @@ -212,4 +212,4 @@ void ED_manipulatortypes_arrow_2d(void) WM_manipulatortype_append(MANIPULATOR_WT_arrow_2d); } -/** \} */ /* Arrow Manipulator API */ +/** \} */ diff --git a/source/blender/editors/manipulator_library/arrow3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c index 122248ba8cf..17e5d53874d 100644 --- a/source/blender/editors/manipulator_library/arrow3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c @@ -65,8 +65,8 @@ #include "WM_api.h" /* own includes */ -#include "manipulator_geometry.h" -#include "manipulator_library_intern.h" +#include "../manipulator_geometry.h" +#include "../manipulator_library_intern.h" /* to use custom arrows exported to geom_arrow_manipulator.c */ //#define USE_MANIPULATOR_CUSTOM_ARROWS @@ -491,4 +491,4 @@ void ED_manipulatortypes_arrow_3d(void) WM_manipulatortype_append(MANIPULATOR_WT_arrow_3d); } -/** \} */ /* Arrow Manipulator API */ +/** \} */ diff --git a/source/blender/editors/manipulator_library/cage2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c index a7e9a89b324..21e5778d509 100644 --- a/source/blender/editors/manipulator_library/cage2d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c @@ -617,4 +617,4 @@ void ED_manipulatortypes_cage_2d(void) WM_manipulatortype_append(MANIPULATOR_WT_cage_2d); } -/** \} */ // Cage Manipulator API +/** \} */ diff --git a/source/blender/editors/manipulator_library/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c index 79ad54e44eb..e8b1a583be9 100644 --- a/source/blender/editors/manipulator_library/dial3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c @@ -65,8 +65,8 @@ #include "WM_types.h" /* own includes */ -#include "manipulator_geometry.h" -#include "manipulator_library_intern.h" +#include "../manipulator_geometry.h" +#include "../manipulator_library_intern.h" /* to use custom dials exported to geom_dial_manipulator.c */ // #define USE_MANIPULATOR_CUSTOM_DIAL @@ -464,4 +464,4 @@ void ED_manipulatortypes_dial_3d(void) WM_manipulatortype_append(MANIPULATOR_WT_dial_3d); } -/** \} */ // Dial Manipulator API +/** \} */ diff --git a/source/blender/editors/manipulator_library/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c index 2a938bcb25a..b5eccaf2699 100644 --- a/source/blender/editors/manipulator_library/grab3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c @@ -60,8 +60,8 @@ #include "WM_types.h" /* own includes */ -#include "manipulator_geometry.h" -#include "manipulator_library_intern.h" +#include "../manipulator_geometry.h" +#include "../manipulator_library_intern.h" static void manipulator_grab_modal(bContext *C, wmManipulator *mpr, const wmEvent *event, const int flag); diff --git a/source/blender/editors/manipulator_library/primitive3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c index 8f3e2ce1db7..b391a063111 100644 --- a/source/blender/editors/manipulator_library/primitive3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c @@ -18,7 +18,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file primitive_manipulator.c +/** \file primitive3d_manipulator.c * \ingroup wm * * \name Primitive Manipulator @@ -52,7 +52,7 @@ #include "ED_manipulator_library.h" /* own includes */ -#include "manipulator_library_intern.h" +#include "../manipulator_library_intern.h" static float verts_plane[4][3] = { {-1, -1, 0}, @@ -192,4 +192,4 @@ void ED_manipulatortypes_primitive_3d(void) WM_manipulatortype_append(MANIPULATOR_WT_primitive_3d); } -/** \} */ // Primitive Manipulator API +/** \} */ |