WM: rename files, manipulator -> gizmo
authorCampbell Barton <ideasman42@gmail.com>
Sat, 14 Jul 2018 21:16:34 +0000 (23:16 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 14 Jul 2018 21:16:34 +0000 (23:16 +0200)
Edit doxy files and header guards only.

70 files changed:
build_files/cmake/macros.cmake
release/scripts/templates_py/gizmo_custom_geometry.py [moved from release/scripts/templates_py/manipulator_custom_geometry.py with 100% similarity]
release/scripts/templates_py/gizmo_operator.py [moved from release/scripts/templates_py/manipulator_operator.py with 100% similarity]
release/scripts/templates_py/gizmo_operator_target.py [moved from release/scripts/templates_py/manipulator_operator_target.py with 100% similarity]
release/scripts/templates_py/gizmo_simple.py [moved from release/scripts/templates_py/manipulator_simple.py with 100% similarity]
source/blender/editors/CMakeLists.txt
source/blender/editors/gizmo_library/CMakeLists.txt [moved from source/blender/editors/manipulator_library/CMakeLists.txt with 63% similarity]
source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c [moved from source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c with 97% similarity]
source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c [moved from source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c with 96% similarity]
source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c [moved from source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c with 99% similarity]
source/blender/editors/gizmo_library/gizmo_draw_utils.c [moved from source/blender/editors/manipulator_library/manipulator_draw_utils.c with 97% similarity]
source/blender/editors/gizmo_library/gizmo_geometry.h [moved from source/blender/editors/manipulator_library/manipulator_geometry.h with 91% similarity]
source/blender/editors/gizmo_library/gizmo_library_intern.h [moved from source/blender/editors/manipulator_library/manipulator_library_intern.h with 94% similarity]
source/blender/editors/gizmo_library/gizmo_library_presets.c [moved from source/blender/editors/manipulator_library/manipulator_library_presets.c with 95% similarity]
source/blender/editors/gizmo_library/gizmo_library_utils.c [moved from source/blender/editors/manipulator_library/manipulator_library_utils.c with 98% similarity]
source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c with 98% similarity]
source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c with 99% similarity]
source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c with 98% similarity]
source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c with 99% similarity]
source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c with 99% similarity]
source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c with 99% similarity]
source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c with 98% similarity]
source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.c [moved from source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c with 97% similarity]
source/blender/editors/include/ED_gizmo_library.h [moved from source/blender/editors/include/ED_manipulator_library.h with 98% similarity]
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/editmesh_add_gizmo.c [moved from source/blender/editors/mesh/editmesh_add_manipulator.c with 99% similarity]
source/blender/editors/mesh/editmesh_bisect.c
source/blender/editors/mesh/editmesh_extrude.c
source/blender/editors/mesh/editmesh_extrude_spin.c
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/node_gizmo.c [moved from source/blender/editors/space_node/node_manipulators.c with 99% similarity]
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/space_view3d/view3d_gizmo_armature.c [moved from source/blender/editors/space_view3d/view3d_manipulator_armature.c with 98% similarity]
source/blender/editors/space_view3d/view3d_gizmo_camera.c [moved from source/blender/editors/space_view3d/view3d_manipulator_camera.c with 99% similarity]
source/blender/editors/space_view3d/view3d_gizmo_empty.c [moved from source/blender/editors/space_view3d/view3d_manipulator_empty.c with 98% similarity]
source/blender/editors/space_view3d/view3d_gizmo_forcefield.c [moved from source/blender/editors/space_view3d/view3d_manipulator_forcefield.c with 97% similarity]
source/blender/editors/space_view3d/view3d_gizmo_lamp.c [moved from source/blender/editors/space_view3d/view3d_manipulator_lamp.c with 98% similarity]
source/blender/editors/space_view3d/view3d_gizmo_navigate.c [moved from source/blender/editors/space_view3d/view3d_manipulator_navigate.c with 99% similarity]
source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c [moved from source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c with 99% similarity]
source/blender/editors/space_view3d/view3d_gizmo_ruler.c [moved from source/blender/editors/space_view3d/view3d_manipulator_ruler.c with 99% similarity]
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/transform/transform_gizmo_2d.c [moved from source/blender/editors/transform/transform_manipulator_2d.c with 99% similarity]
source/blender/editors/transform/transform_gizmo_3d.c [moved from source/blender/editors/transform/transform_manipulator_3d.c with 99% similarity]
source/blender/editors/util/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_wm_gizmo.c [moved from source/blender/makesrna/intern/rna_wm_manipulator.c with 99% similarity]
source/blender/makesrna/intern/rna_wm_gizmo_api.c [moved from source/blender/makesrna/intern/rna_wm_manipulator_api.c with 97% similarity]
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_gizmo_wrap.c [moved from source/blender/python/intern/bpy_manipulator_wrap.c with 98% similarity]
source/blender/python/intern/bpy_gizmo_wrap.h [moved from source/blender/python/intern/bpy_manipulator_wrap.h with 86% similarity]
source/blender/python/intern/bpy_msgbus.c
source/blender/python/intern/bpy_rna_gizmo.c [moved from source/blender/python/intern/bpy_rna_manipulator.c with 99% similarity]
source/blender/python/intern/bpy_rna_gizmo.h [moved from source/blender/python/intern/bpy_rna_manipulator.h with 85% similarity]
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/gizmo/WM_gizmo_api.h [moved from source/blender/windowmanager/manipulators/WM_manipulator_api.h with 98% similarity]
source/blender/windowmanager/gizmo/WM_gizmo_types.h [moved from source/blender/windowmanager/manipulators/WM_manipulator_types.h with 98% similarity]
source/blender/windowmanager/gizmo/intern/wm_gizmo.c [moved from source/blender/windowmanager/manipulators/intern/wm_manipulator.c with 99% similarity]
source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c [moved from source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c with 99% similarity]
source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c [moved from source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c with 97% similarity]
source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h [moved from source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h with 96% similarity]
source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c [moved from source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c with 99% similarity]
source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c [moved from source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c with 98% similarity]
source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c [moved from source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c with 97% similarity]
source/blender/windowmanager/gizmo/wm_gizmo_fn.h [moved from source/blender/windowmanager/manipulators/wm_manipulator_fn.h with 95% similarity]
source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h [moved from source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h with 95% similarity]
source/blender/windowmanager/wm.h

index 545b0e8ce5df5652d354d9071f6f5d011b1ad227..b2ec8f6e7a95ae59d09284a1720684d1a3d0ee23 100644 (file)
@@ -600,7 +600,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_editor_curve
                bf_editor_gpencil
                bf_editor_interface
-               bf_editor_manipulator_library
+               bf_editor_gizmo_library
                bf_editor_mesh
                bf_editor_metaball
                bf_editor_object
@@ -635,7 +635,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
                bf_physics
                bf_nodes
                bf_rna
-               bf_editor_manipulator_library  # rna -> manipulator bad-level calls
+               bf_editor_gizmo_library  # rna -> gizmo bad-level calls
                bf_python
                bf_imbuf
                bf_blenlib
index 2b30382f4a4773201e3f8d4228f188031f9f7250..cf1db751c85271c2947069f70ab28ed4e79cf597 100644 (file)
@@ -30,7 +30,7 @@ if(WITH_BLENDER)
        add_subdirectory(interface)
        add_subdirectory(io)
        add_subdirectory(lattice)
-       add_subdirectory(manipulator_library)
+       add_subdirectory(gizmo_library)
        add_subdirectory(mask)
        add_subdirectory(mesh)
        add_subdirectory(metaball)
similarity index 63%
rename from source/blender/editors/manipulator_library/CMakeLists.txt
rename to source/blender/editors/gizmo_library/CMakeLists.txt
index 86e1bb3b6d7f9797dedc4b63234dbeb40df2fc43..389820240e2692b50f3c3e7327610ab543d5613c 100644 (file)
@@ -37,24 +37,24 @@ set(INC_SYS
 )
 
 set(SRC
-       manipulator_draw_utils.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/button2d_manipulator.c
-       manipulator_types/cage2d_manipulator.c
-       manipulator_types/cage3d_manipulator.c
-       manipulator_types/dial3d_manipulator.c
-       manipulator_types/grab3d_manipulator.c
-       manipulator_types/primitive3d_manipulator.c
+       gizmo_draw_utils.c
+       gizmo_geometry.h
+       gizmo_library_intern.h
+       gizmo_library_presets.c
+       gizmo_library_utils.c
+       geometry/geom_arrow_gizmo.c
+       geometry/geom_cube_gizmo.c
+       geometry/geom_dial_gizmo.c
+       gizmo_types/arrow2d_gizmo.c
+       gizmo_types/arrow3d_gizmo.c
+       gizmo_types/button2d_gizmo.c
+       gizmo_types/cage2d_gizmo.c
+       gizmo_types/cage3d_gizmo.c
+       gizmo_types/dial3d_gizmo.c
+       gizmo_types/grab3d_gizmo.c
+       gizmo_types/primitive3d_gizmo.c
 )
 
 add_definitions(${GL_DEFINITIONS})
 
-blender_add_lib(bf_editor_manipulator_library "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_editor_gizmo_library "${SRC}" "${INC}" "${INC_SYS}")
similarity index 97%
rename from source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c
rename to source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
index 34f7d73589c64a186e5cb0e0af3dba38e1e6c5ed..e8804238590a251338c9cce6431fca104d4ddede 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file geom_arrow_manipulator.c
+/** \file geom_arrow_gizmo.c
  *  \ingroup wm
  */
 
-#include "../manipulator_geometry.h"
+#include "../gizmo_geometry.h"
 
 static float verts[][3] = {
        {-0.000000, 0.012320, 0.000000},
similarity index 96%
rename from source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c
rename to source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
index cee8e1e22eec06ef82ebc5a287d05405d94ce103..f2d038213020c6eeb3e22c5d5184033a3efdb6f5 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file geom_cube_manipulator.c
+/** \file geom_cube_gizmo.c
  *  \ingroup wm
  */
 
-#include "../manipulator_geometry.h"
+#include "../gizmo_geometry.h"
 
 static const float verts[][3] = {
        {1.000000, 1.000000, -1.000000},
similarity index 99%
rename from source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c
rename to source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
index 811fc872a8179509a388f27e3763a35762e1fbfb..bc3fb6fcafff416f8df4946a227c7dfc6784a734 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file geom_dial_manipulator.c
+/** \file geom_dial_gizmo.c
  *  \ingroup wm
  */
 
-#include "../manipulator_geometry.h"
+#include "../gizmo_geometry.h"
 
 static const float verts[][3] = {
        {1.034000, 0.000000, 0.000000},
similarity index 97%
rename from source/blender/editors/manipulator_library/manipulator_draw_utils.c
rename to source/blender/editors/gizmo_library/gizmo_draw_utils.c
index 80181c571159edc730c98b56f6dd55b464b8b90b..8ae21f617582e0b45ef406a0e12013976c30009a 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_draw_utils.c
+/** \file gizmo_draw_utils.c
  *  \ingroup wm
  */
 
@@ -54,7 +54,7 @@
 #include "wm.h"
 
 /* own includes */
-#include "manipulator_library_intern.h"
+#include "gizmo_library_intern.h"
 
 /**
  * Main draw call for ManipulatorGeomInfo data
similarity index 91%
rename from source/blender/editors/manipulator_library/manipulator_geometry.h
rename to source/blender/editors/gizmo_library/gizmo_geometry.h
index 2083f9d4d31f61cfb352d8ebbea68fb9fbf00644..de976bbad4802e5be89225b914afb5807ddda7de 100644 (file)
@@ -21,7 +21,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_geometry.h
+/** \file gizmo_geometry.h
  *  \ingroup wm
  *
  * \name Manipulator Geometry
@@ -31,8 +31,8 @@
  */
 
 
-#ifndef __MANIPULATOR_GEOMETRY_H__
-#define __MANIPULATOR_GEOMETRY_H__
+#ifndef __GIZMO_GEOMETRY_H__
+#define __GIZMO_GEOMETRY_H__
 
 typedef struct ManipulatorGeomInfo {
        int nverts;
@@ -51,4 +51,4 @@ extern ManipulatorGeomInfo wm_manipulator_geom_data_cube;
 /* dial manipulator */
 extern ManipulatorGeomInfo wm_manipulator_geom_data_dial;
 
-#endif  /* __MANIPULATOR_GEOMETRY_H__ */
+#endif  /* __GIZMO_GEOMETRY_H__ */
similarity index 94%
rename from source/blender/editors/manipulator_library/manipulator_library_intern.h
rename to source/blender/editors/gizmo_library/gizmo_library_intern.h
index 55db99236e0136acfa2f61e60086d38841eb82c0..17121d3752e7ef48df7c5a9966ec6eaf9ef39099 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_library_intern.h
+/** \file gizmo_library_intern.h
  *  \ingroup wm
  */
 
-#ifndef __MANIPULATOR_LIBRARY_INTERN_H__
-#define __MANIPULATOR_LIBRARY_INTERN_H__
+#ifndef __GIZMO_LIBRARY_INTERN_H__
+#define __GIZMO_LIBRARY_INTERN_H__
 
 /* distance around which manipulators respond to input (and get highlighted) */
 #define MANIPULATOR_HOTSPOT 14.0f
@@ -100,7 +100,7 @@ bool manipulator_window_project_3d(
 /* -------------------------------------------------------------------- */
 /* Manipulator drawing */
 
-#include "manipulator_geometry.h"
+#include "gizmo_geometry.h"
 
 void wm_manipulator_geometryinfo_draw(const struct ManipulatorGeomInfo *info, const bool select, const float color[4]);
 void wm_manipulator_vec_draw(
@@ -108,4 +108,4 @@ void wm_manipulator_vec_draw(
         uint pos, uint primitive_type);
 
 
-#endif  /* __MANIPULATOR_LIBRARY_INTERN_H__ */
+#endif  /* __GIZMO_LIBRARY_INTERN_H__ */
similarity index 95%
rename from source/blender/editors/manipulator_library/manipulator_library_presets.c
rename to source/blender/editors/gizmo_library/gizmo_library_presets.c
index 12f07611722c793b08421d07630a19186d093295..d58e0c9dc85aecb4016e12e4f348772240973a02 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/manipulator_library/manipulator_library_presets.c
+/** \file blender/editors/gizmo_library/gizmo_library_presets.c
  *  \ingroup wm
  *
  * \name Manipulator Lib Presets
@@ -54,8 +54,8 @@
 #include "ED_screen.h"
 
 /* own includes */
-#include "ED_manipulator_library.h"  /* own include */
-#include "manipulator_library_intern.h"  /* own include */
+#include "ED_gizmo_library.h"  /* own include */
+#include "gizmo_library_intern.h"  /* own include */
 
 /* TODO, this is to be used by RNA. might move to ED_manipulator_library */
 
similarity index 98%
rename from source/blender/editors/manipulator_library/manipulator_library_utils.c
rename to source/blender/editors/gizmo_library/gizmo_library_utils.c
index 957f0abdd710ac18edfa8a2a9844f0780e5bac4d..794728dd03cf8dedd2aa076c225934decb808df2 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file manipulator_library_utils.c
+/** \file gizmo_library_utils.c
  *  \ingroup wm
  *
  * \name Manipulator Library Utilities
@@ -47,7 +47,7 @@
 #include "ED_view3d.h"
 
 /* own includes */
-#include "manipulator_library_intern.h"
+#include "gizmo_library_intern.h"
 
 /* factor for precision tweaking */
 #define MANIPULATOR_PRECISION_FAC 0.05f
similarity index 98%
rename from source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
index 5acf1ab2d647a9845cfe84a63bacc22a0a1338db..fbb30b955625c8ded00bb6ba480a7efd1aa12f8b 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file arrow2d_manipulator.c
+/** \file arrow2d_gizmo.c
  *  \ingroup wm
  *
  * \name 2D Arrow Manipulator
 #include "WM_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
 #include "WM_api.h"
 
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 static void arrow2d_draw_geom(wmManipulator *mpr, const float matrix[4][4], const float color[4])
 {
similarity index 99%
rename from source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
index 0430a12bc99bfe5d1773e6e8e9de73626674c7ba..72b24e03c00828a0160b67cbc1f60ab8881cb3a8 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file arrow3d_manipulator.c
+/** \file arrow3d_gizmo.c
  *  \ingroup wm
  *
  * \name Arrow Manipulator
 
 #include "ED_view3d.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 /* to use custom arrows exported to geom_arrow_manipulator.c */
 //#define USE_MANIPULATOR_CUSTOM_ARROWS
similarity index 98%
rename from source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
index db33f45705615e26261effe341a2fd9c0f608103..78f374064e6b54a7c42a101c272bf7eaec0c6fcf 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file button2d_manipulator.c
+/** \file button2d_gizmo.c
  *  \ingroup wm
  *
  * \name Button Manipulator
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_interface.h"
 #include "UI_interface_icons.h"
 #include "UI_resources.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 typedef struct ButtonManipulator2D {
        wmManipulator manipulator;
similarity index 99%
rename from source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
index b7b19ccd634fe9fa9b7c17ca2aad72aeaec037a1..382733d298f36f3db260c373648392b5ff171c16 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file cage2d_manipulator.c
+/** \file cage2d_gizmo.c
  *  \ingroup wm
  *
  * \name Cage Manipulator
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 #define MANIPULATOR_RESIZER_SIZE 10.0f
 #define MANIPULATOR_MARGIN_OFFSET_SCALE 1.5f
similarity index 99%
rename from source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
index a907816b08f5d2f27aa94e21760a6a6aa8b6950d..0f3e67d7585837dae868cfba9e1a97c8ca109382 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file cage3d_manipulator.c
+/** \file cage3d_gizmo.c
  *  \ingroup wm
  *
  * \name Cage Manipulator
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 #define MANIPULATOR_RESIZER_SIZE 10.0f
 #define MANIPULATOR_MARGIN_OFFSET_SCALE 1.5f
similarity index 99%
rename from source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
index 74ba8bd77a9b4a62e6e8789c06cfb9cb980b06f0..8d0061f66c89a96b7bf53c37c9f5105f056bcfc9 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file dial3d_manipulator.c
+/** \file dial3d_gizmo.c
  *  \ingroup wm
  *
  * \name Dial Manipulator
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 /* to use custom dials exported to geom_dial_manipulator.c */
 // #define USE_MANIPULATOR_CUSTOM_DIAL
similarity index 98%
rename from source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
index 458dc2fd1c8306969d68ced317c9fbf8b3afd34d..e55b57327b68d8eca0b7e91d84808a6b3ced002e 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file grab3d_manipulator.c
+/** \file grab3d_gizmo.c
  *  \ingroup wm
  *
  * \name Grab Manipulator
 
 #include "ED_screen.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_geometry.h"
-#include "../manipulator_library_intern.h"
+#include "../gizmo_geometry.h"
+#include "../gizmo_library_intern.h"
 
 typedef struct GrabManipulator3D {
        wmManipulator manipulator;
similarity index 97%
rename from source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
rename to source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.c
index 419873ccffffe9f460c985c2dd38ce2109959bfb..1331a4e983f1cadc7f036a36e5901ac9c15c8b82 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file primitive3d_manipulator.c
+/** \file primitive3d_gizmo.c
  *  \ingroup wm
  *
  * \name Primitive Manipulator
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 /* own includes */
-#include "../manipulator_library_intern.h"
+#include "../gizmo_library_intern.h"
 
 static float verts_plane[4][3] = {
        {-1, -1, 0},
similarity index 98%
rename from source/blender/editors/include/ED_manipulator_library.h
rename to source/blender/editors/include/ED_gizmo_library.h
index fca0f5c8806fa5483b7af259d80359f401b7a9de..b33fbf47630cadbc17fb2f85d0a325a63490bd1d 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file ED_manipulator_library.h
+/** \file ED_gizmo_library.h
  *  \ingroup wm
  *
  * \name Generic Manipulators.
@@ -27,8 +27,8 @@
  */
 
 
-#ifndef __ED_MANIPULATOR_LIBRARY_H__
-#define __ED_MANIPULATOR_LIBRARY_H__
+#ifndef __ED_GIZMO_LIBRARY_H__
+#define __ED_GIZMO_LIBRARY_H__
 
 /* initialize manipulators */
 void ED_manipulatortypes_arrow_2d(void);
@@ -219,4 +219,4 @@ enum {
        ED_MANIPULATOR_PRIMITIVE_STYLE_PLANE = 0,
 };
 
-#endif  /* __ED_MANIPULATOR_LIBRARY_H__ */
+#endif  /* __ED_GIZMO_LIBRARY_H__ */
index 5cd768b4fe38e9b8906321a144a43bfb7670c336..81ec591fc899d463201310d4928791872b7206a9 100644 (file)
@@ -44,7 +44,7 @@ set(INC_SYS
 set(SRC
        editface.c
        editmesh_add.c
-       editmesh_add_manipulator.c
+       editmesh_add_gizmo.c
        editmesh_bevel.c
        editmesh_bisect.c
        editmesh_extrude.c
similarity index 99%
rename from source/blender/editors/mesh/editmesh_add_manipulator.c
rename to source/blender/editors/mesh/editmesh_add_gizmo.c
index f1704972e816407620e5518de91453a0934fb4e7..3918d8847a6388ae9c062a32d16e488b13fe1e0d 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/mesh/editmesh_add_manipulator.c
+/** \file blender/editors/mesh/editmesh_add_gizmo.c
  *  \ingroup edmesh
  *
  * Creation manipulators.
@@ -34,7 +34,7 @@
 #include "BKE_context.h"
 #include "BKE_editmesh.h"
 
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 #include "ED_mesh.h"
 #include "ED_object.h"
 #include "ED_screen.h"
index 579cd5e4e0823af02a6c0f7f78ddc730d7f50baa..87a65924979e21f460525d39d711877198cce80d 100644 (file)
@@ -57,7 +57,7 @@
 #define USE_MANIPULATOR
 
 #ifdef USE_MANIPULATOR
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 #include "ED_undo.h"
 #endif
 
index be68bfda09c154831b2ce7905ffa8a70161c8386..b007bcf04baa1fba0e2a0071071443c12a069863 100644 (file)
@@ -53,7 +53,7 @@
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_view3d.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
index 5c1b9ccc178de857d2025da31b4fbc2ffca0dc19..74e2833b2d919701d7467372138a3c8e93888b76 100644 (file)
@@ -57,7 +57,7 @@
 #define USE_MANIPULATOR
 
 #ifdef USE_MANIPULATOR
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 #include "ED_undo.h"
 #endif
 
index 2ee791e81d6559be098fd790d7f7150970b8d4f6..37f5ed642febfac6e7d81296950613ba0e6b0bc9 100644 (file)
@@ -67,7 +67,7 @@
 #include "ED_clip.h"
 #include "ED_mask.h"
 #include "ED_sequencer.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "io_ops.h"
 
index 77b1351435bff3fcf3973a2ae77fc923977e836e..06a00945452550f5bbae4d835dc519554af0233d 100644 (file)
@@ -48,7 +48,7 @@ set(SRC
        node_draw.c
        node_edit.c
        node_group.c
-       node_manipulators.c
+       node_gizmo.c
        node_ops.c
        node_relationships.c
        node_select.c
similarity index 99%
rename from source/blender/editors/space_node/node_manipulators.c
rename to source/blender/editors/space_node/node_gizmo.c
index 851e3973288f8d479ee5f1cef53ae7d6b7495a66..62b4a4b6583c4878aee020fe8f3a735564bef331 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_node/node_manipulators.c
+/** \file blender/editors/space_node/node_gizmo.c
  *  \ingroup spnode
  */
 
@@ -34,7 +34,7 @@
 #include "BKE_main.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "IMB_imbuf_types.h"
 
index f8e38587117244a332e37fb0119cb96898c24ff5..b85525dd2ee2ee1322ca02699ae6cd2d33f6b2dd 100644 (file)
@@ -55,14 +55,14 @@ set(SRC
        view3d_walk.c
        view3d_header.c
        view3d_iterators.c
-       view3d_manipulator_armature.c
-       view3d_manipulator_camera.c
-       view3d_manipulator_empty.c
-       view3d_manipulator_forcefield.c
-       view3d_manipulator_lamp.c
-       view3d_manipulator_navigate.c
-       view3d_manipulator_navigate_type.c
-       view3d_manipulator_ruler.c
+       view3d_gizmo_armature.c
+       view3d_gizmo_camera.c
+       view3d_gizmo_empty.c
+       view3d_gizmo_forcefield.c
+       view3d_gizmo_lamp.c
+       view3d_gizmo_navigate.c
+       view3d_gizmo_navigate_type.c
+       view3d_gizmo_ruler.c
        view3d_ops.c
        view3d_project.c
        view3d_ruler.c
similarity index 98%
rename from source/blender/editors/space_view3d/view3d_manipulator_armature.c
rename to source/blender/editors/space_view3d/view3d_gizmo_armature.c
index 17dc4d8eb4a131dd4c877b5f8ec9f902df6ea614..16c7d5748733b6a720da56c59b415ffd904349fe 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_armature.c
+/** \file blender/editors/space_view3d/view3d_gizmo_armature.c
  *  \ingroup spview3d
  */
 
@@ -36,7 +36,7 @@
 
 #include "ED_armature.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
similarity index 99%
rename from source/blender/editors/space_view3d/view3d_manipulator_camera.c
rename to source/blender/editors/space_view3d/view3d_gizmo_camera.c
index 29f380c63348394d6e624aac41de5223661f94e2..0c97669a9af81d718db9effc8c09cf6ad9550b10 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_camera.c
+/** \file blender/editors/space_view3d/view3d_gizmo_camera.c
  *  \ingroup spview3d
  */
 
@@ -35,7 +35,7 @@
 
 #include "ED_armature.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
similarity index 98%
rename from source/blender/editors/space_view3d/view3d_manipulator_empty.c
rename to source/blender/editors/space_view3d/view3d_gizmo_empty.c
index 16424c39bb85e30d5eda409f543642f22f74e76d..89f55bc1d9aa8f07cfdaab1fb2c9b939cd95db7b 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_empty.c
+/** \file blender/editors/space_view3d/view3d_gizmo_empty.c
  *  \ingroup spview3d
  */
 
@@ -35,7 +35,7 @@
 #include "DNA_lamp_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
similarity index 97%
rename from source/blender/editors/space_view3d/view3d_manipulator_forcefield.c
rename to source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
index e4535004c8f3b1f57a4d5fd3593dc838f002a5bb..db985c18c0849c25a90952163a94c97293eb3eb0 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_forcefield.c
+/** \file blender/editors/space_view3d/view3d_gizmo_forcefield.c
  *  \ingroup spview3d
  */
 
@@ -34,7 +34,7 @@
 #include "DNA_object_force_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
similarity index 98%
rename from source/blender/editors/space_view3d/view3d_manipulator_lamp.c
rename to source/blender/editors/space_view3d/view3d_gizmo_lamp.c
index 39e908ec99d1178925dea3637070cc49f2514314..8087fcbdddd7a8093a42fcbb46676666f95fb993 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_lamp.c
+/** \file blender/editors/space_view3d/view3d_gizmo_lamp.c
  *  \ingroup spview3d
  */
 
@@ -34,7 +34,7 @@
 #include "DNA_lamp_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
similarity index 99%
rename from source/blender/editors/space_view3d/view3d_manipulator_navigate.c
rename to source/blender/editors/space_view3d/view3d_gizmo_navigate.c
index 465faf70fcd04cd191902c3f52e2b9ddd96517d5..db4eeef18f761e9cf242b8230fbff3286513b977 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_navigate.c
+/** \file blender/editors/space_view3d/view3d_gizmo_navigate.c
  *  \ingroup spview3d
  */
 
@@ -32,7 +32,7 @@
 #include "DNA_object_types.h"
 
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_interface.h"
 #include "UI_resources.h"
similarity index 99%
rename from source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c
rename to source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
index 996da2a1475369d87d7d948dc2d494c9d038b333..072f2ee458379a0b855d667893ff74e9bb3eea39 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file view3d_manipulator_navigate_type.c
+/** \file view3d_gizmo_navigate_type.c
  *  \ingroup wm
  *
  * \name Custom Orientation/Navigation Manipulator for the 3D View
similarity index 99%
rename from source/blender/editors/space_view3d/view3d_manipulator_ruler.c
rename to source/blender/editors/space_view3d/view3d_gizmo_ruler.c
index d102fdc6e04228fbaf45ef609f9fac88ea8defc1..c29b07e41474cf6ae2d2f494faf4374fe594d1ee 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/space_view3d/view3d_manipulator_ruler.c
+/** \file blender/editors/space_view3d/view3d_gizmo_ruler.c
  *  \ingroup spview3d
  */
 
index 3e132192875b7f86072ea5f8aae5efb3265e8b7c..45055eb12254f602c5018bbf57d95b55be358d63 100644 (file)
@@ -46,8 +46,8 @@ set(SRC
        transform_conversions.c
        transform_generics.c
        transform_input.c
-       transform_manipulator_2d.c
-       transform_manipulator_3d.c
+       transform_gizmo_2d.c
+       transform_gizmo_3d.c
        transform_ops.c
        transform_orientations.c
        transform_snap.c
similarity index 99%
rename from source/blender/editors/transform/transform_manipulator_2d.c
rename to source/blender/editors/transform/transform_gizmo_2d.c
index fd6e7ed5442587caf56c13e4421d932a6acd45fa..5d5d55de848826a18574a2badb18997b04b163d3 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/transform/transform_manipulator_2d.c
+/** \file blender/editors/transform/transform_gizmo_2d.c
  *  \ingroup edtransform
  *
  * \name 2D Transform Manipulator
@@ -52,7 +52,7 @@
 #include "ED_image.h"
 #include "ED_screen.h"
 #include "ED_uvedit.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "transform.h" /* own include */
 
similarity index 99%
rename from source/blender/editors/transform/transform_manipulator_3d.c
rename to source/blender/editors/transform/transform_gizmo_3d.c
index 7dc72ddff6f272e1228900463498a875b5e9c683..1a30bd1cdcb497c596a386a6dd54a3880d2a4234 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/transform/transform_manipulator_3d.c
+/** \file blender/editors/transform/transform_gizmo_3d.c
  *  \ingroup edtransform
  *
  * \name 3D Transform Manipulator
@@ -74,7 +74,7 @@
 #include "ED_view3d.h"
 #include "ED_gpencil.h"
 #include "ED_screen.h"
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 #include "UI_resources.h"
 
index fa21facefc2d09e0aad4cb0ada7c74d5ab3dc99b..97ea0da6007f6a269621a35ce2a0ae10c02ec7ff 100644 (file)
@@ -63,7 +63,7 @@ set(SRC
        ../include/ED_lattice.h
        ../include/ED_logic.h
        ../include/ED_markers.h
-       ../include/ED_manipulator_library.h
+       ../include/ED_gizmo_library.h
        ../include/ED_mask.h
        ../include/ED_mball.h
        ../include/ED_mesh.h
index 2288e6c8405ce820b1a0e00c7773a85c7d037543..eb32a5fc6cb4ee997305351375f81d40331724fe 100644 (file)
@@ -92,7 +92,7 @@ set(DEFSRC
        rna_userdef.c
        rna_vfont.c
        rna_wm.c
-       rna_wm_manipulator.c
+       rna_wm_gizmo.c
        rna_workspace.c
        rna_world.c
 )
@@ -121,7 +121,7 @@ set(APISRC
        rna_ui_api.c
        rna_vfont_api.c
        rna_wm_api.c
-       rna_wm_manipulator_api.c
+       rna_wm_gizmo_api.c
        rna_workspace_api.c
 )
 
index 4b06d917ab7070b7867bb08852f3328eced54423..bb24452d67a0ea575b0b2b800ec00014a88dd0c6 100644 (file)
@@ -3443,7 +3443,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
        {"rna_userdef.c", NULL, RNA_def_userdef},
        {"rna_vfont.c", "rna_vfont_api.c", RNA_def_vfont},
        {"rna_wm.c", "rna_wm_api.c", RNA_def_wm},
-       {"rna_wm_manipulator.c", "rna_wm_manipulator_api.c", RNA_def_wm_manipulator},
+       {"rna_wm_gizmo.c", "rna_wm_gizmo_api.c", RNA_def_wm_manipulator},
        {"rna_workspace.c", "rna_workspace_api.c", RNA_def_workspace},
        {"rna_world.c", NULL, RNA_def_world},
        {"rna_movieclip.c", NULL, RNA_def_movieclip},
similarity index 99%
rename from source/blender/makesrna/intern/rna_wm_manipulator.c
rename to source/blender/makesrna/intern/rna_wm_gizmo.c
index f1abaa73e70a668380d2032e526a00d8b151a5b2..c2c4c95b83ff1e4cbc6937ad1000fb28a0cc8ebf 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/makesrna/intern/rna_wm_manipulator.c
+/** \file blender/makesrna/intern/rna_wm_gizmo.c
  *  \ingroup RNA
  */
 
similarity index 97%
rename from source/blender/makesrna/intern/rna_wm_manipulator_api.c
rename to source/blender/makesrna/intern/rna_wm_gizmo_api.c
index 1680404260892d3ed71be88ec0274f76d954149d..b06ba4d3dacde7b04c40bbb97552ec358cac6a8e 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/makesrna/intern/rna_wm_manipulator_api.c
+/** \file blender/makesrna/intern/rna_wm_gizmo_api.c
  *  \ingroup RNA
  */
 
@@ -44,7 +44,7 @@
 #include "UI_interface.h"
 #include "BKE_context.h"
 
-#include "ED_manipulator_library.h"
+#include "ED_gizmo_library.h"
 
 static void rna_manipulator_draw_preset_box(
         wmManipulator *mpr, float matrix[16], int select_id)
@@ -242,7 +242,7 @@ void RNA_api_manipulator(StructRNA *srna)
        /* Property API */
 
        /* Define Properties */
-       /* note, 'target_set_handler' is defined in 'bpy_rna_manipulator.c' */
+       /* note, 'target_set_handler' is defined in 'bpy_rna_gizmo.c' */
        func = RNA_def_function(srna, "target_set_prop", "rna_manipulator_target_set_prop");
        RNA_def_function_flag(func, FUNC_USE_REPORTS);
        RNA_def_function_ui_description(func, "");
@@ -270,7 +270,7 @@ void RNA_api_manipulator(StructRNA *srna)
        RNA_def_function_return(func, parm);
 
        /* Access Properties */
-       /* note, 'target_get', 'target_set' is defined in 'bpy_rna_manipulator.c' */
+       /* note, 'target_get', 'target_set' is defined in 'bpy_rna_gizmo.c' */
        func = RNA_def_function(srna, "target_is_valid", "rna_manipulator_target_is_valid");
        RNA_def_function_flag(func, FUNC_USE_REPORTS);
        parm = RNA_def_string(func, "property", NULL, 0, "", "Property identifier");
index b3f4b4977bf3af732cbf87e24d89019f98def6aa..3255fb49667d3a39c053c1f13c1063534763c2c2 100644 (file)
@@ -66,7 +66,7 @@ set(SRC
        bpy_intern_string.c
        bpy_library_load.c
        bpy_library_write.c
-       bpy_manipulator_wrap.c
+       bpy_gizmo_wrap.c
        bpy_msgbus.c
        bpy_operator.c
        bpy_operator_wrap.c
@@ -78,7 +78,7 @@ set(SRC
        bpy_rna_callback.c
        bpy_rna_driver.c
        bpy_rna_id_collection.c
-       bpy_rna_manipulator.c
+       bpy_rna_gizmo.c
        bpy_traceback.c
        bpy_utils_previews.c
        bpy_utils_units.c
@@ -105,7 +105,7 @@ set(SRC
        bpy_driver.h
        bpy_intern_string.h
        bpy_library.h
-       bpy_manipulator_wrap.h
+       bpy_gizmo_wrap.h
        bpy_msgbus.h
        bpy_operator.h
        bpy_operator_wrap.h
@@ -116,7 +116,7 @@ set(SRC
        bpy_rna_callback.h
        bpy_rna_driver.h
        bpy_rna_id_collection.h
-       bpy_rna_manipulator.h
+       bpy_rna_gizmo.h
        bpy_traceback.h
        bpy_utils_previews.h
        bpy_utils_units.h
index 751625e378b38cfb3241be2c628e6d0bb65cb0d2..3083322d496c057634f6b84cd834f2589f5f1d7b 100644 (file)
@@ -46,7 +46,7 @@
 #include "bpy_rna.h"
 #include "bpy_app.h"
 #include "bpy_rna_id_collection.h"
-#include "bpy_rna_manipulator.h"
+#include "bpy_rna_gizmo.h"
 #include "bpy_props.h"
 #include "bpy_library.h"
 #include "bpy_operator.h"
similarity index 98%
rename from source/blender/python/intern/bpy_manipulator_wrap.c
rename to source/blender/python/intern/bpy_gizmo_wrap.c
index 3703ea92fa712ef0f79e6540ca30cd9d78863a45..eda1f58a4cc8bb64ab724240de4db48a397340c2 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_manipulator_wrap.c
+/** \file blender/python/intern/bpy_gizmo_wrap.c
  *  \ingroup pythonintern
  *
  * This file is so Python can define widget-group's that C can call into.
@@ -43,7 +43,7 @@
 
 #include "bpy_rna.h"
 #include "bpy_intern_string.h"
-#include "bpy_manipulator_wrap.h"  /* own include */
+#include "bpy_gizmo_wrap.h"  /* own include */
 
 /* we may want to add, but not now */
 
similarity index 86%
rename from source/blender/python/intern/bpy_manipulator_wrap.h
rename to source/blender/python/intern/bpy_gizmo_wrap.h
index 3e4153502287d5f4cdc690fb2f1e2dca83b6224d..71fa123d6ceb7feaa85145a6da5451254b254556 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_manipulator_wrap.h
+/** \file blender/python/intern/bpy_gizmo_wrap.h
  *  \ingroup pythonintern
  */
 
-#ifndef __BPY_MANIPULATOR_WRAP_H__
-#define __BPY_MANIPULATOR_WRAP_H__
+#ifndef __BPY_GIZMO_WRAP_H__
+#define __BPY_GIZMO_WRAP_H__
 
 struct wmManipulatorType;
 struct wmManipulatorGroupType;
@@ -32,4 +32,4 @@ struct wmManipulatorGroupType;
 void BPY_RNA_manipulator_wrapper(struct wmManipulatorType *wt, void *userdata);
 void BPY_RNA_manipulatorgroup_wrapper(struct wmManipulatorGroupType *wgt, void *userdata);
 
-#endif  /* __BPY_MANIPULATOR_WRAP_H__ */
+#endif  /* __BPY_GIZMO_WRAP_H__ */
index b76ecafe6f09e3ca11981ed9aab5b27f91de2803..101cc8b41a367fd2d0a43636c52cff44ae76c728 100644 (file)
@@ -44,7 +44,7 @@
 #include "bpy_capi_utils.h"
 #include "bpy_rna.h"
 #include "bpy_intern_string.h"
-#include "bpy_manipulator_wrap.h"  /* own include */
+#include "bpy_gizmo_wrap.h"  /* own include */
 
 
 #include "bpy_msgbus.h"  /* own include */
similarity index 99%
rename from source/blender/python/intern/bpy_rna_manipulator.c
rename to source/blender/python/intern/bpy_rna_gizmo.c
index 950f7f98be093e0b76423c38605da5e3d8cf86a4..34a4594bdae8cdc9038b87c1e42979246434c7b4 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_rna_manipulator.c
+/** \file blender/python/intern/bpy_rna_gizmo.c
  *  \ingroup pythonintern
  *
  * .
@@ -38,7 +38,7 @@
 #include "WM_types.h"
 
 #include "bpy_capi_utils.h"
-#include "bpy_rna_manipulator.h"
+#include "bpy_rna_gizmo.h"
 
 #include "../generic/py_capi_utils.h"
 #include "../generic/python_utildefines.h"
similarity index 85%
rename from source/blender/python/intern/bpy_rna_manipulator.h
rename to source/blender/python/intern/bpy_rna_gizmo.h
index b6f3a2e651df539bc091fdcb05cdca69dfbe5e60..e848fd9800f2fdd68aa8008a2f8695f3e5f12c8a 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/python/intern/bpy_rna_manipulator.h
+/** \file blender/python/intern/bpy_rna_gizmo.h
  *  \ingroup pythonintern
  */
 
-#ifndef __BPY_RNA_MANIPULATOR_H__
-#define __BPY_RNA_MANIPULATOR_H__
+#ifndef __BPY_RNA_GIZMO_H__
+#define __BPY_RNA_GIZMO_H__
 
 int BPY_rna_manipulator_module(PyObject *);
 
-#endif  /* __BPY_RNA_MANIPULATOR_H__ */
+#endif  /* __BPY_RNA_GIZMO_H__ */
index 67674dae4f3d721f3642c25a7bef75c718cd5115..edf763645030ee202108e122e13e02a68d923017 100644 (file)
@@ -25,8 +25,8 @@
 
 set(INC
        .
-       manipulators
-       manipulators/intern
+       gizmo
+       gizmo/intern
        ../blenfont
        ../blenkernel
        ../blenlib
@@ -79,12 +79,12 @@ set(SRC
        intern/wm_tooltip.c
        intern/wm_uilist_type.c
        intern/wm_window.c
-       manipulators/intern/wm_manipulator.c
-       manipulators/intern/wm_manipulator_group.c
-       manipulators/intern/wm_manipulator_group_type.c
-       manipulators/intern/wm_manipulator_map.c
-       manipulators/intern/wm_manipulator_target_props.c
-       manipulators/intern/wm_manipulator_type.c
+       gizmo/intern/wm_gizmo.c
+       gizmo/intern/wm_gizmo_group.c
+       gizmo/intern/wm_gizmo_group_type.c
+       gizmo/intern/wm_gizmo_map.c
+       gizmo/intern/wm_gizmo_target_props.c
+       gizmo/intern/wm_gizmo_type.c
        message_bus/intern/wm_message_bus.c
        message_bus/intern/wm_message_bus_rna.c
        message_bus/intern/wm_message_bus_static.c
@@ -100,11 +100,11 @@ set(SRC
        wm_event_types.h
        wm_files.h
        wm_window.h
-       manipulators/WM_manipulator_api.h
-       manipulators/WM_manipulator_types.h
-       manipulators/wm_manipulator_fn.h
-       manipulators/wm_manipulator_wmapi.h
-       manipulators/intern/wm_manipulator_intern.h
+       gizmo/WM_gizmo_api.h
+       gizmo/WM_gizmo_types.h
+       gizmo/wm_gizmo_fn.h
+       gizmo/wm_gizmo_wmapi.h
+       gizmo/intern/wm_gizmo_intern.h
        message_bus/intern/wm_message_bus_intern.h
        message_bus/wm_message_bus.h
 )
index 8b7633b635bcba46d268afb7d974b217ac114eeb..486eae0a0ed0b493c6f76fa1eafb7b417d2397ff 100644 (file)
@@ -121,10 +121,10 @@ struct ImBuf;
 /* exported types for WM */
 #include "wm_cursors.h"
 #include "wm_event_types.h"
-#include "manipulators/WM_manipulator_types.h"
+#include "gizmo/WM_gizmo_types.h"
 
 /* Include external manipulator API's */
-#include "manipulators/WM_manipulator_api.h"
+#include "gizmo/WM_gizmo_api.h"
 
 /* ************** wmOperatorType ************************ */
 
similarity index 98%
rename from source/blender/windowmanager/manipulators/WM_manipulator_api.h
rename to source/blender/windowmanager/gizmo/WM_gizmo_api.h
index b88956ac28de7c0ec91ace720b76424e72699ec0..ffd18af496ebdbbc1857f6b164a02f80c51fe0fb 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/WM_manipulator_api.h
+/** \file blender/windowmanager/gizmos/WM_gizmo_api.h
  *  \ingroup wm
  *
  * \name Manipulator API
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_API_H__
-#define __WM_MANIPULATOR_API_H__
+#ifndef __WM_GIZMO_API_H__
+#define __WM_GIZMO_API_H__
 
 struct ARegion;
 struct GHashIterator;
@@ -54,7 +54,7 @@ struct wmManipulatorMapType_Params;
 struct wmMsgSubscribeKey;
 struct wmMsgSubscribeValue;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 /* -------------------------------------------------------------------- */
 /* wmManipulator */
@@ -340,4 +340,4 @@ bool WM_manipulator_context_check_drawstep(const struct bContext *C, eWM_Manipul
 
 bool WM_manipulator_group_type_poll(const struct bContext *C, const struct wmManipulatorGroupType *wgt);
 
-#endif  /* __WM_MANIPULATOR_API_H__ */
+#endif  /* __WM_GIZMO_API_H__ */
similarity index 98%
rename from source/blender/windowmanager/manipulators/WM_manipulator_types.h
rename to source/blender/windowmanager/gizmo/WM_gizmo_types.h
index ee2f833858a3bdcb485527ba7f587f60c902099f..0f6af6db24c1b9d2ff113784e54bb73c0b7c5cb1 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/WM_manipulator_types.h
+/** \file blender/windowmanager/gizmo/WM_gizmo_types.h
  *  \ingroup wm
  *
  * \name Manipulator Types
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_TYPES_H__
-#define __WM_MANIPULATOR_TYPES_H__
+#ifndef __WM_GIZMO_TYPES_H__
+#define __WM_GIZMO_TYPES_H__
 
 #include "BLI_compiler_attrs.h"
 
@@ -148,7 +148,7 @@ typedef enum {
        WM_MANIPULATOR_TWEAK_SNAP = (1 << 1),
 } eWM_ManipulatorTweak;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 typedef struct wmManipulatorOpElem {
        struct wmOperatorType *type;
@@ -419,4 +419,4 @@ typedef enum eWM_ManipulatorMapDrawStep {
 } eWM_ManipulatorMapDrawStep;
 #define WM_MANIPULATORMAP_DRAWSTEP_MAX 2
 
-#endif  /* __WM_MANIPULATOR_TYPES_H__ */
+#endif  /* __WM_GIZMO_TYPES_H__ */
similarity index 99%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator.c
rename to source/blender/windowmanager/gizmo/intern/wm_gizmo.c
index d6eb110dca034fa4edb5e86e87e18819fe4ddfee..bef193f6c567fb0e4479ce0dc9bef97abb904b32 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo.c
  *  \ingroup wm
  */
 
@@ -63,8 +63,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 static void wm_manipulator_register(
         wmManipulatorGroup *mgroup, wmManipulator *mpr);
similarity index 99%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
rename to source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
index 8bda9e91db7997365f7259d8cac9215bc938f3d5..83af1a71163e9a06594067355b5f0bf3202479c9 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_group.c
  *  \ingroup wm
  *
  * \name Manipulator-Group
@@ -57,8 +57,8 @@
 #include "ED_undo.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 #ifdef WITH_PYTHON
 #  include "BPY_extern.h"
similarity index 97%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
rename to source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
index b32eb84e28903ad4a7aab306c02ec0f67a0d94d1..f93beb0ac9ff52981ca029f10c67da93446d21c4 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
  *  \ingroup wm
  */
 
@@ -40,8 +40,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 
 /** \name ManipulatorGroup Type Append
similarity index 96%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
rename to source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
index ecf4ffd2ac48689edf6025a831d76df2a5213271..7a007a8a9099c059e7590986900e345cf9a0a352 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
  *  \ingroup wm
  */
 
 
-#ifndef __WM_MANIPULATOR_INTERN_H__
-#define __WM_MANIPULATOR_INTERN_H__
+#ifndef __WM_GIZMO_INTERN_H__
+#define __WM_GIZMO_INTERN_H__
 
 struct wmKeyConfig;
 struct wmManipulatorMap;
 struct ManipulatorGeomInfo;
 struct GHashIterator;
 
-#include "wm_manipulator_fn.h"
+#include "wm_gizmo_fn.h"
 
 /* -------------------------------------------------------------------- */
 /* wmManipulator */
similarity index 99%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c
rename to source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
index 2a3aa5df197bb6670bba686dac05c713c913ab2e..94db6b458877be68723fc4ace4e5687b43649d6e 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_map.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_map.c
  *  \ingroup wm
  */
 
@@ -57,8 +57,8 @@
 #include "DEG_depsgraph.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 /**
  * Store all manipulator-maps here. Anyone who wants to register a manipulator for a certain
similarity index 98%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
rename to source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
index 137e8f5639d1f620f8f4bad5a63131467de765e3..78d12e4e4ba3a5f382dd534c901d6d7b4a558285 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
  *  \ingroup wm
  */
 
@@ -43,8 +43,8 @@
 #include "ED_view3d.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 /* -------------------------------------------------------------------- */
 
similarity index 97%
rename from source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c
rename to source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
index fd7f31db903bc2898580ee14b8122a50d0ddc58f..4f31afb5b563f34342d11a3fc044e3cfd41c66bc 100644 (file)
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/intern/wm_manipulator_type.c
+/** \file blender/windowmanager/gizmo/intern/wm_gizmo_type.c
  *  \ingroup wm
  */
 
@@ -48,8 +48,8 @@
 #include "wm.h"
 
 /* own includes */
-#include "wm_manipulator_wmapi.h"
-#include "wm_manipulator_intern.h"
+#include "wm_gizmo_wmapi.h"
+#include "wm_gizmo_intern.h"
 
 
 /** \name Manipulator Type Append
similarity index 95%
rename from source/blender/windowmanager/manipulators/wm_manipulator_fn.h
rename to source/blender/windowmanager/gizmo/wm_gizmo_fn.h
index 305d04eab6815432cfc4cd5219595e357140f306..8d28febbd5de58f89d2572013a51e6eb86491000 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/wm_manipulator_fn.h
+/** \file blender/windowmanager/gizmo/wm_gizmo_fn.h
  *  \ingroup wm
  *
  * Callback function definitions, needed for both Types & API headers.
  */
 
-#ifndef __WM_MANIPULATOR_FN_H__
-#define __WM_MANIPULATOR_FN_H__
+#ifndef __WM_GIZMO_FN_H__
+#define __WM_GIZMO_FN_H__
 
 #include "BLI_compiler_attrs.h"
 
@@ -85,4 +85,4 @@ typedef struct wmManipulatorPropertyFnParams {
        void *user_data;
 } wmManipulatorPropertyFnParams;
 
-#endif  /* __WM_MANIPULATOR_FN_H__ */
+#endif  /* __WM_GIZMO_FN_H__ */
similarity index 95%
rename from source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
rename to source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
index a470c5c28ea1d1d8d0ed2c1d6e904476bb9fa6e3..80418cbfeb3d6d706b89f024d6ae67ca47fc2499 100644 (file)
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/manipulators/wm_manipulator_wmapi.h
+/** \file blender/windowmanager/gizmo/wm_gizmo_wmapi.h
  *  \ingroup wm
  *
  * \name Manipulators Window Manager API
@@ -35,8 +35,8 @@
  */
 
 
-#ifndef __WM_MANIPULATOR_WMAPI_H__
-#define __WM_MANIPULATOR_WMAPI_H__
+#ifndef __WM_GIZMO_WMAPI_H__
+#define __WM_GIZMO_WMAPI_H__
 
 struct wmEventHandler;
 struct wmManipulatorMap;
@@ -94,4 +94,4 @@ struct ListBase *wm_manipulatormap_groups_get(wmManipulatorMap *mmap);
 
 void wm_manipulatormaptypes_free(void);
 
-#endif  /* __WM_MANIPULATOR_WMAPI_H__ */
+#endif  /* __WM_GIZMO_WMAPI_H__ */
index d17d5f7d157cf6371d4ba4c46df23f669680c05e..04353b5533477eedfc2f7746d945fe8db2583869 100644 (file)
@@ -35,7 +35,7 @@ struct ARegion;
 struct wmWindow;
 struct ReportList;
 
-#include "manipulators/wm_manipulator_wmapi.h"
+#include "gizmo/wm_gizmo_wmapi.h"
 
 typedef struct wmPaintCursor {
        struct wmPaintCursor *next, *prev;