[Bf-blender-cvs] [64da6d8] temp_manipulators_core: Rename files and folders (widget->manipulator)
Julian Eisel
noreply at git.blender.org
Fri Sep 9 17:55:00 CEST 2016
Commit: 64da6d876da79dc2b5014883436e66ad15f6e976
Author: Julian Eisel
Date: Fri Sep 9 17:11:19 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rB64da6d876da79dc2b5014883436e66ad15f6e976
Rename files and folders (widget->manipulator)
===================================================================
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
R096 source/blender/windowmanager/widgets/WM_widget_api.h source/blender/windowmanager/manipulators/WM_manipulator_api.h
R095 source/blender/windowmanager/widgets/WM_widget_library.h source/blender/windowmanager/manipulators/WM_manipulator_library.h
R095 source/blender/windowmanager/widgets/WM_widget_types.h source/blender/windowmanager/manipulators/WM_manipulator_types.h
R095 source/blender/windowmanager/widgets/intern/widget_library/arrow2d_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
R098 source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
R098 source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
R096 source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
R097 source/blender/windowmanager/widgets/intern/widget_library/geom_arrow_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/geom_arrow_manipulator.c
R095 source/blender/windowmanager/widgets/intern/widget_library/geom_cube_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/geom_cube_manipulator.c
R099 source/blender/windowmanager/widgets/intern/widget_library/geom_dial_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/geom_dial_manipulator.c
R088 source/blender/windowmanager/widgets/intern/widget_library/widget_geometry.h source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_geometry.h
R092 source/blender/windowmanager/widgets/intern/widget_library/widget_library_intern.h source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_intern.h
R093 source/blender/windowmanager/widgets/intern/widget_library/widget_library_utils.c source/blender/windowmanager/manipulators/intern/manipulator_library/manipulator_library_utils.c
R094 source/blender/windowmanager/widgets/intern/widget_library/primitive_widget.c source/blender/windowmanager/manipulators/intern/manipulator_library/primitive_manipulator.c
R098 source/blender/windowmanager/widgets/intern/wm_widget.c source/blender/windowmanager/manipulators/intern/wm_manipulator.c
R094 source/blender/windowmanager/widgets/intern/wm_widget_intern.h source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
R099 source/blender/windowmanager/widgets/intern/wm_widgetgroup.c source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
R099 source/blender/windowmanager/widgets/intern/wm_widgetmap.c source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
R096 source/blender/windowmanager/widgets/wm_widget_wmapi.h source/blender/windowmanager/manipulators/wm_manipulator_wmapi.h
===================================================================
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 4c343e4..c9cf538 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -25,8 +25,8 @@
set(INC
.
- widgets
- widgets/intern
+ manipulators
+ manipulators/intern
../blenfont
../blenkernel
../blenlib
@@ -70,18 +70,18 @@ set(SRC
intern/wm_subwindow.c
intern/wm_window.c
intern/wm_stereo.c
- widgets/intern/wm_widget.c
- widgets/intern/wm_widgetgroup.c
- widgets/intern/wm_widgetmap.c
- widgets/intern/widget_library/arrow_widget.c
- widgets/intern/widget_library/arrow2d_widget.c
- widgets/intern/widget_library/cage_widget.c
- widgets/intern/widget_library/dial_widget.c
- widgets/intern/widget_library/primitive_widget.c
- widgets/intern/widget_library/geom_arrow_widget.c
- widgets/intern/widget_library/geom_cube_widget
- widgets/intern/widget_library/geom_dial_widget.c
- widgets/intern/widget_library/widget_library_utils.c
+ manipulators/intern/wm_manipulator.c
+ manipulators/intern/wm_manipulatorgroup.c
+ manipulators/intern/wm_manipulatormap.c
+ manipulators/intern/manipulator_library/arrow_manipulator.c
+ manipulators/intern/manipulator_library/arrow2d_manipulator.c
+ manipulators/intern/manipulator_library/cage_manipulator.c
+ manipulators/intern/manipulator_library/dial_manipulator.c
+ manipulators/intern/manipulator_library/primitive_manipulator.c
+ manipulators/intern/manipulator_library/geom_arrow_manipulator.c
+ manipulators/intern/manipulator_library/geom_cube_manipulator.c
+ manipulators/intern/manipulator_library/geom_dial_manipulator.c
+ manipulators/intern/manipulator_library/manipulator_library_utils.c
WM_api.h
WM_keymap.h
@@ -94,13 +94,13 @@ set(SRC
wm_files.h
wm_subwindow.h
wm_window.h
- widgets/WM_widget_api.h
- widgets/WM_widget_types.h
- widgets/WM_widget_library.h
- widgets/wm_widget_wmapi.h
- widgets/intern/wm_widget_intern.h
- widgets/intern/widget_library/widget_geometry.h
- widgets/intern/widget_library/widget_library_intern.h
+ manipulators/WM_manipulator_api.h
+ manipulators/WM_manipulator_types.h
+ manipulators/WM_manipulator_library.h
+ manipulators/wm_manipulator_wmapi.h
+ manipulators/intern/wm_manipulator_intern.h
+ manipulators/intern/manipulator_library/manipulator_geometry.h
+ manipulators/intern/manipulator_library/manipulator_library_intern.h
)
if(WITH_AUDASPACE)
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 6522d56..48c376e 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -43,8 +43,8 @@
#include "BLI_compiler_attrs.h"
/* Include external widget API's */
-#include "widgets/WM_widget_api.h"
-#include "widgets/WM_widget_library.h"
+#include "manipulators/WM_manipulator_api.h"
+#include "manipulators/WM_manipulator_library.h"
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index f9ba73d..6fd1d80 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -119,7 +119,7 @@ struct ImBuf;
/* exported types for WM */
#include "wm_cursors.h"
#include "wm_event_types.h"
-#include "widgets/WM_widget_types.h"
+#include "manipulators/WM_manipulator_types.h"
/* ************** wmOperatorType ************************ */
diff --git a/source/blender/windowmanager/widgets/WM_widget_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
similarity index 96%
rename from source/blender/windowmanager/widgets/WM_widget_api.h
rename to source/blender/windowmanager/manipulators/WM_manipulator_api.h
index ae698c3..2ab1602 100644
--- a/source/blender/windowmanager/widgets/WM_widget_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -23,18 +23,18 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/WM_widget_api.h
+/** \file blender/windowmanager/manipulators/WM_manipulator_api.h
* \ingroup wm
*
- * \name Widget API
+ * \name Manipulator API
* \brief API for external use of wmWidget types.
*
* Only included in WM_api.h
*/
-#ifndef __WM_WIDGET_API_H__
-#define __WM_WIDGET_API_H__
+#ifndef __WM_MANIPULATOR_API_H__
+#define __WM_MANIPULATOR_API_H__
struct ARegion;
struct Main;
@@ -114,5 +114,5 @@ bool WM_widgetmap_select_all(struct bContext *C, struct wmWidgetMap *wmap, const
bool WM_widgetmap_cursor_set(const struct wmWidgetMap *wmap, struct wmWindow *win);
-#endif /* __WM_WIDGET_API_H__ */
+#endif /* __WM_MANIPULATOR_API_H__ */
diff --git a/source/blender/windowmanager/widgets/WM_widget_library.h b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
similarity index 95%
rename from source/blender/windowmanager/widgets/WM_widget_library.h
rename to source/blender/windowmanager/manipulators/WM_manipulator_library.h
index 8137a28..b2912bb 100644
--- a/source/blender/windowmanager/widgets/WM_widget_library.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_library.h
@@ -20,17 +20,17 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/WM_widget_library.h
+/** \file blender/windowmanager/manipulators/WM_manipulator_library.h
* \ingroup wm
*
- * \name Generic Widget Library
+ * \name Generic Manipulator Library
*
* Only included in WM_api.h and lower level files.
*/
-#ifndef __WM_WIDGET_LIBRARY_H__
-#define __WM_WIDGET_LIBRARY_H__
+#ifndef __WM_MANIPULATOR_LIBRARY_H__
+#define __WM_MANIPULATOR_LIBRARY_H__
struct wmWidgetGroup;
@@ -122,5 +122,5 @@ struct wmWidget *WIDGET_primitive_new(struct wmWidgetGroup *wgroup, const char *
void WIDGET_primitive_set_direction(struct wmWidget *widget, const float direction[3]);
void WIDGET_primitive_set_up_vector(struct wmWidget *widget, const float direction[3]);
-#endif /* __WM_WIDGET_LIBRARY_H__ */
+#endif /* __WM_MANIPULATOR_LIBRARY_H__ */
diff --git a/source/blender/windowmanager/widgets/WM_widget_types.h b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
similarity index 95%
rename from source/blender/windowmanager/widgets/WM_widget_types.h
rename to source/blender/windowmanager/manipulators/WM_manipulator_types.h
index 2143645..2beb8a2 100644
--- a/source/blender/windowmanager/widgets/WM_widget_types.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
@@ -23,18 +23,18 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/WM_widget_types.h
+/** \file blender/windowmanager/manipulators/WM_manipulator_types.h
* \ingroup wm
*
- * \name Widget Types
- * \brief Widget defines for external use.
+ * \name Manipulator Types
+ * \brief Manipulator defines for external use.
*
* Only included in WM_types.h and lower level files.
*/
-#ifndef __WM_WIDGET_TYPES_H__
-#define __WM_WIDGET_TYPES_H__
+#ifndef __WM_MANIPULATOR_TYPES_H__
+#define __WM_MANIPULATOR_TYPES_H__
#include "BLI_compiler_attrs.h"
@@ -162,5 +162,5 @@ enum eWidgetMapTypeFlag {
WM_WIDGETMAPTYPE_3D = (1 << 0),
};
-#endif /* __WM_WIDGET_TYPES_H__ */
+#endif /* __WM_MANIPULATOR_TYPES_H__ */
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/arrow2d_widget.c b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
similarity index 95%
rename from source/blender/windowmanager/widgets/intern/widget_library/arrow2d_widget.c
rename to source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
index 0f321f2..f454961 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/arrow2d_widget.c
+++ b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
@@ -1,4 +1,3 @@
-
/*
* ***** BEGIN GPL LICENSE BLOCK *****
*
@@ -24,10 +23,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/intern/widget_library/arrow2d_widget.c
+/** \file blender/windowmanager/manipulators/intern/manipulator_library/arrow2d_manipulator.c
* \ingroup wm
*
- * \name 2D Arrow Widget
+ * \name 2D Arrow Manipulator
*
* 2D Widget
*
@@ -54,11 +53,11 @@
#include "WM_types.h"
/* own includes */
-#include "WM_widget_types.h"
-#include "wm_widget_wmapi.h"
-#include "WM_widget_library.h"
-#include "wm_widget_intern.h"
-#include "widget_library_intern.h"
+#include "WM_manipulator_types.h"
+#include "wm_manipulator_wmapi.h"
+#include "WM_manipulator_library.h"
+#include "wm_manipulator_intern.h"
+#include "manipulator_library_intern.h"
typedef struct ArrowWidget2D {
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
similarity index 98%
rename from source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
rename to source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
index c98de58..8b6a338 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
+++ b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
@@ -23,10 +23,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
+/** \file blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
* \ingroup wm
*
- * \name Arrow Widget
+ * \name Arrow Manipulator
*
* 3D Widget
*
@@ -55,10 +55,10 @@
#include "WM_api.h"
/* own includes */
-#include "wm_widget_wmapi.h"
-#include "wm_widget_intern.h"
-#include "widget_geometry.h"
-#include "widget_library_intern.h"
+#include "wm_manipulator_wmapi.h"
+#include "wm_manipulator_intern.h"
+#include "manipulator_geometry.h"
+#include "manipulator_library_intern.h"
/* to use custom arrows exported to geom_arrow_widget.c */
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c b/source/blender/windowmanager/manipulators/intern/manipulator_library/cage_manipulator.c
similarity index 98%
rename from source/blender/win
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list