[Bf-blender-cvs] [cd160041324] blender2.8: WM: rename files, manipulator -> gizmo
Campbell Barton
noreply at git.blender.org
Sat Jul 14 23:53:19 CEST 2018
Commit: cd1600413246a62156441f6e7910489b19ae5a28
Author: Campbell Barton
Date: Sat Jul 14 23:16:34 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcd1600413246a62156441f6e7910489b19ae5a28
WM: rename files, manipulator -> gizmo
Edit doxy files and header guards only.
===================================================================
M build_files/cmake/macros.cmake
R100 release/scripts/templates_py/manipulator_custom_geometry.py release/scripts/templates_py/gizmo_custom_geometry.py
R100 release/scripts/templates_py/manipulator_operator.py release/scripts/templates_py/gizmo_operator.py
R100 release/scripts/templates_py/manipulator_operator_target.py release/scripts/templates_py/gizmo_operator_target.py
R100 release/scripts/templates_py/manipulator_simple.py release/scripts/templates_py/gizmo_simple.py
M source/blender/editors/CMakeLists.txt
R063 source/blender/editors/manipulator_library/CMakeLists.txt source/blender/editors/gizmo_library/CMakeLists.txt
R097 source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
R096 source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
R099 source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
R097 source/blender/editors/manipulator_library/manipulator_draw_utils.c source/blender/editors/gizmo_library/gizmo_draw_utils.c
R091 source/blender/editors/manipulator_library/manipulator_geometry.h source/blender/editors/gizmo_library/gizmo_geometry.h
R094 source/blender/editors/manipulator_library/manipulator_library_intern.h source/blender/editors/gizmo_library/gizmo_library_intern.h
R095 source/blender/editors/manipulator_library/manipulator_library_presets.c source/blender/editors/gizmo_library/gizmo_library_presets.c
R098 source/blender/editors/manipulator_library/manipulator_library_utils.c source/blender/editors/gizmo_library/gizmo_library_utils.c
R098 source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/arrow2d_gizmo.c
R099 source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
R098 source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.c
R099 source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
R099 source/blender/editors/manipulator_library/manipulator_types/cage3d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
R099 source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c
R098 source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/grab3d_gizmo.c
R097 source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.c
R098 source/blender/editors/include/ED_manipulator_library.h source/blender/editors/include/ED_gizmo_library.h
M source/blender/editors/mesh/CMakeLists.txt
R099 source/blender/editors/mesh/editmesh_add_manipulator.c source/blender/editors/mesh/editmesh_add_gizmo.c
M source/blender/editors/mesh/editmesh_bisect.c
M source/blender/editors/mesh/editmesh_extrude.c
M source/blender/editors/mesh/editmesh_extrude_spin.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/space_node/CMakeLists.txt
R099 source/blender/editors/space_node/node_manipulators.c source/blender/editors/space_node/node_gizmo.c
M source/blender/editors/space_view3d/CMakeLists.txt
R098 source/blender/editors/space_view3d/view3d_manipulator_armature.c source/blender/editors/space_view3d/view3d_gizmo_armature.c
R099 source/blender/editors/space_view3d/view3d_manipulator_camera.c source/blender/editors/space_view3d/view3d_gizmo_camera.c
R098 source/blender/editors/space_view3d/view3d_manipulator_empty.c source/blender/editors/space_view3d/view3d_gizmo_empty.c
R097 source/blender/editors/space_view3d/view3d_manipulator_forcefield.c source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
R098 source/blender/editors/space_view3d/view3d_manipulator_lamp.c source/blender/editors/space_view3d/view3d_gizmo_lamp.c
R099 source/blender/editors/space_view3d/view3d_manipulator_navigate.c source/blender/editors/space_view3d/view3d_gizmo_navigate.c
R099 source/blender/editors/space_view3d/view3d_manipulator_navigate_type.c source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
R099 source/blender/editors/space_view3d/view3d_manipulator_ruler.c source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M source/blender/editors/transform/CMakeLists.txt
R099 source/blender/editors/transform/transform_manipulator_2d.c source/blender/editors/transform/transform_gizmo_2d.c
R099 source/blender/editors/transform/transform_manipulator_3d.c source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/util/CMakeLists.txt
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/makesrna.c
R099 source/blender/makesrna/intern/rna_wm_manipulator.c source/blender/makesrna/intern/rna_wm_gizmo.c
R097 source/blender/makesrna/intern/rna_wm_manipulator_api.c source/blender/makesrna/intern/rna_wm_gizmo_api.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy.c
R098 source/blender/python/intern/bpy_manipulator_wrap.c source/blender/python/intern/bpy_gizmo_wrap.c
R086 source/blender/python/intern/bpy_manipulator_wrap.h source/blender/python/intern/bpy_gizmo_wrap.h
M source/blender/python/intern/bpy_msgbus.c
R099 source/blender/python/intern/bpy_rna_manipulator.c source/blender/python/intern/bpy_rna_gizmo.c
R085 source/blender/python/intern/bpy_rna_manipulator.h source/blender/python/intern/bpy_rna_gizmo.h
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/WM_types.h
R098 source/blender/windowmanager/manipulators/WM_manipulator_api.h source/blender/windowmanager/gizmo/WM_gizmo_api.h
R098 source/blender/windowmanager/manipulators/WM_manipulator_types.h source/blender/windowmanager/gizmo/WM_gizmo_types.h
R099 source/blender/windowmanager/manipulators/intern/wm_manipulator.c source/blender/windowmanager/gizmo/intern/wm_gizmo.c
R099 source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
R097 source/blender/windowmanager/manipulators/intern/wm_manipulator_group_type.c source/blender/windowmanager/gizmo/intern/wm_gizmo_group_type.c
R096 source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
R099 source/blender/windowmanager/manipulators/intern/wm_manipulator_map.c source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
R098 source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
R097 source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c source/blender/windowmanager/gizmo/intern/wm_gizmo_type.c
R095 source/blender/windowmanager/manipulators/wm_manipulator_fn.h source/blender/windowmanager/gizmo/wm_gizmo_fn.h
R095 source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
M source/blender/windowmanager/wm.h
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 545b0e8ce5d..b2ec8f6e7a9 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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
diff --git a/release/scripts/templates_py/manipulator_custom_geometry.py b/release/scripts/templates_py/gizmo_custom_geometry.py
similarity index 100%
rename from release/scripts/templates_py/manipulator_custom_geometry.py
rename to release/scripts/templates_py/gizmo_custom_geometry.py
diff --git a/release/scripts/templates_py/manipulator_operator.py b/release/scripts/templates_py/gizmo_operator.py
similarity index 100%
rename from release/scripts/templates_py/manipulator_operator.py
rename to release/scripts/templates_py/gizmo_operator.py
diff --git a/release/scripts/templates_py/manipulator_operator_target.py b/release/scripts/templates_py/gizmo_operator_target.py
similarity index 100%
rename from release/scripts/templates_py/manipulator_operator_target.py
rename to release/scripts/templates_py/gizmo_operator_target.py
diff --git a/release/scripts/templates_py/manipulator_simple.py b/release/scripts/templates_py/gizmo_simple.py
similarity index 100%
rename from release/scripts/templates_py/manipulator_simple.py
rename to release/scripts/templates_py/gizmo_simple.py
diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 2b30382f4a4..cf1db751c85 100644
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -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)
diff --git a/source/blender/editors/manipulator_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt
similarity index 63%
rename from source/blender/editors/manipulator_library/CMakeLists.txt
rename to source/blender/editors/gizmo_library/CMakeLists.txt
index 86e1bb3b6d7..389820240e2 100644
--- a/source/blender/editors/manipulator_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -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}")
diff --git a/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c b/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
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 34f7d73589c..e8804238590 100644
--- a/source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_arrow_gizmo.c
@@ -21,11 +21,11 @@
* ***** 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},
diff --git a/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c b/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
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 cee8e1e22ee..f2d03821302 100644
--- a/source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_cube_gizmo.c
@@ -23,11 +23,11 @@
* ***** 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},
diff --git a/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c b/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
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 811fc872a81..bc3fb6fcaff 100644
--- a/source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c
+++ b/source/blender/editors/gizmo_library/geometry/geom_dial_gizmo.c
@@ -21,11 +21,11 @@
* ***** 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},
diff --git a/source/blender/editors/manipulator_library/manipulator_draw_utils.c b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
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 80181c57115..8ae21f61758 100644
--- a/source/blender/editors/manipulator_library/manipulator_draw_utils.c
+++ b/source/blender/editors/gizmo_library/gizmo_draw_utils.c
@@ -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
diff --git a/source/blender/editors/manipulator_library/manipulator_geometry.h b/source/blender/editors/gizmo_library/gizmo_geometry.h
similarity index 91%
rename from source/blender/editors/manipulator_library/manipulator_geometry.h
rename to source/blender/editors/gizmo_library/gizmo_geometry.h
index 2083f9d4d31..de976bbad48 100644
--- a/source/blender/editors/manipulator_library/manipulator_geometry.h
+++ b/source/blender/editors/gizmo_library/gizmo_geometry.h
@@ -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__ */
diff --git a/source/blender/editors/manipulator_library/manipulator_library_intern.h b/source/blender/editors/gizmo_library/gizmo_library_intern.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 55db99236e0..17121d3752e 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_intern.h
+++ b/source/blender/editors/gizmo_library/gizmo_library_intern.h
@@ -23,12 +23,12 @@
* ***** 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__ */
diff --git a/source/blender/editors/manipulator_library/manipulator_library_presets.c b/source/blender/editors/gizmo_library/gizmo_library_presets.c
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 12f07611722..d58e0c9dc85 100644
--- a/source/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list