[Bf-blender-cvs] [7f00568] temp_widgets_files_refactor: Add widgets/intern, improve naming, move around files
Julian Eisel
noreply at git.blender.org
Tue Feb 9 15:09:08 CET 2016
Commit: 7f005682337afedd1fef3a67b0aa75529e8a18af
Author: Julian Eisel
Date: Tue Feb 9 15:02:54 2016 +0100
Branches: temp_widgets_files_refactor
https://developer.blender.org/rB7f005682337afedd1fef3a67b0aa75529e8a18af
Add widgets/intern, improve naming, move around files
After feedback from Campbell.
File structure now looks like this:
/windowmangager
...
/widgets
WM_widget_api.h
WM_widget_library.h
WM_widget_types.h
wm_widget_wmapi.h
/intern
wm_widget_intern.h
wm_widget.c
wm_widgetgroup.c
wm_widgetmap.c
/widget_library
...
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/windowmanager/CMakeLists.txt
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/WM_types.h
A source/blender/windowmanager/widgets/WM_widget_api.h
A source/blender/windowmanager/widgets/WM_widget_library.h
A source/blender/windowmanager/widgets/WM_widget_types.h
D source/blender/windowmanager/widgets/WM_widgets_api.h
D source/blender/windowmanager/widgets/WM_widgets_types.h
A source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/geom_arrow_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/geom_cube_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/geom_dial_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/plane_widget.c
A source/blender/windowmanager/widgets/intern/widget_library/widget_geometry.h
A source/blender/windowmanager/widgets/intern/wm_widget.c
A source/blender/windowmanager/widgets/intern/wm_widget_intern.h
A source/blender/windowmanager/widgets/intern/wm_widgetgroup.c
A source/blender/windowmanager/widgets/intern/wm_widgetmap.c
D source/blender/windowmanager/widgets/widget_library/arrow_widget.c
D source/blender/windowmanager/widgets/widget_library/cage_widget.c
D source/blender/windowmanager/widgets/widget_library/dial_widget.c
D source/blender/windowmanager/widgets/widget_library/facemap_widget.c
D source/blender/windowmanager/widgets/widget_library/geom_arrow_widget.c
D source/blender/windowmanager/widgets/widget_library/geom_cube_widget.c
D source/blender/windowmanager/widgets/widget_library/geom_dial_widget.c
D source/blender/windowmanager/widgets/widget_library/plane_widget.c
D source/blender/windowmanager/widgets/widget_library/widget_geometry.h
D source/blender/windowmanager/widgets/widget_library/widget_library.h
D source/blender/windowmanager/widgets/wm_widget.c
A source/blender/windowmanager/widgets/wm_widget_wmapi.h
D source/blender/windowmanager/widgets/wm_widgetgroup.c
D source/blender/windowmanager/widgets/wm_widgetmap.c
D source/blender/windowmanager/widgets/wm_widgets.h
D source/blender/windowmanager/widgets/wm_widgets_intern.h
M source/blender/windowmanager/wm.h
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 9628dc1..48e6ed5 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 9628dc1922be2fb6281bc66f5f7512c2a57c294a
+Subproject commit 48e6ed58b44b9bac6c1aa8671a07ea4a7c72ee3a
diff --git a/release/scripts/addons b/release/scripts/addons
index 407d0ea..b7a4aa5 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 407d0ea752b3af73d3f13ba072671bd09eefecb1
+Subproject commit b7a4aa544884c9a2a1223657875f060ad53b7b1e
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 9f29e18..6668384 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 9f29e18707917ec5be262431d2e09dbb85332f41
+Subproject commit 66683843bb43bb9e732fcb3f632116ca977c9bb3
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index a8bfdf6..2575d05 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -67,17 +67,17 @@ set(SRC
intern/wm_subwindow.c
intern/wm_window.c
intern/wm_stereo.c
- widgets/wm_widget.c
- widgets/wm_widgetgroup.c
- widgets/wm_widgetmap.c
- widgets/widget_library/arrow_widget.c
- widgets/widget_library/cage_widget.c
- widgets/widget_library/dial_widget.c
- widgets/widget_library/facemap_widget.c
- widgets/widget_library/plane_widget.c
- widgets/widget_library/geom_arrow_widget.c
- widgets/widget_library/geom_cube_widget
- widgets/widget_library/geom_dial_widget.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/cage_widget.c
+ widgets/intern/widget_library/dial_widget.c
+ widgets/intern/widget_library/facemap_widget.c
+ widgets/intern/widget_library/plane_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
WM_api.h
WM_keymap.h
@@ -90,12 +90,12 @@ set(SRC
wm_files.h
wm_subwindow.h
wm_window.h
- widgets/WM_widgets_api.h
- widgets/wm_widgets.h
- widgets/wm_widgets_intern.h
- widgets/WM_widgets_types.h
- widgets/widget_library/widget_geometry.h
- widgets/widget_library/widget_library.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
)
if(WITH_AUDASPACE)
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index fad8413..cd44af7 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -43,7 +43,8 @@
#include "WM_keymap.h"
#include "BLI_compiler_attrs.h"
-#include "widgets/WM_widgets_api.h"
+#include "widgets/WM_widget_api.h"
+#include "widgets/WM_widget_library.h"
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index c42c72c..a04fe6f 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -121,7 +121,7 @@ struct ImBuf;
/* exported types for WM */
#include "wm_cursors.h"
#include "wm_event_types.h"
-#include "widgets/WM_widgets_types.h"
+#include "widgets/WM_widget_types.h"
/* ************** wmOperatorType ************************ */
diff --git a/source/blender/windowmanager/widgets/WM_widgets_api.h b/source/blender/windowmanager/widgets/WM_widget_api.h
similarity index 98%
rename from source/blender/windowmanager/widgets/WM_widgets_api.h
rename to source/blender/windowmanager/widgets/WM_widget_api.h
index 9d8cfa1..5976b1e 100644
--- a/source/blender/windowmanager/widgets/WM_widgets_api.h
+++ b/source/blender/windowmanager/widgets/WM_widget_api.h
@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/WM_widgets_api.h
+/** \file blender/windowmanager/widget/WM_widget_api.h
* \ingroup wm
*
* \name Widget API
@@ -36,14 +36,13 @@
#ifndef __WM_WIDGETS_API__
#define __WM_WIDGETS_API__
-#include "widget_library/widget_library.h"
-
struct ARegion;
struct Main;
struct wmEventHandler;
struct wmKeyConfig;
struct wmKeyMap;
struct wmOperator;
+struct wmWidgetGroup;
struct wmWidgetGroupType;
struct wmWidgetMap;
struct wmWidgetMapType;
diff --git a/source/blender/windowmanager/widgets/widget_library/widget_library.h b/source/blender/windowmanager/widgets/WM_widget_library.h
similarity index 98%
rename from source/blender/windowmanager/widgets/widget_library/widget_library.h
rename to source/blender/windowmanager/widgets/WM_widget_library.h
index 6062831..7bceb4d 100644
--- a/source/blender/windowmanager/widgets/widget_library/widget_library.h
+++ b/source/blender/windowmanager/widgets/WM_widget_library.h
@@ -20,7 +20,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/widget_library/widget_library.h
+/** \file blender/windowmanager/widget/widget_library/widget_library.h
* \ingroup wm
*
* \name Generic Widget Library
diff --git a/source/blender/windowmanager/widgets/WM_widgets_types.h b/source/blender/windowmanager/widgets/WM_widget_types.h
similarity index 98%
rename from source/blender/windowmanager/widgets/WM_widgets_types.h
rename to source/blender/windowmanager/widgets/WM_widget_types.h
index 97e69bf..c36a755 100644
--- a/source/blender/windowmanager/widgets/WM_widgets_types.h
+++ b/source/blender/windowmanager/widgets/WM_widget_types.h
@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/WM_widgets_types.h
+/** \file blender/windowmanager/widget/WM_widget_types.h
* \ingroup wm
*
* \name Widget Types
diff --git a/source/blender/windowmanager/widgets/widget_library/arrow_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
similarity index 99%
rename from source/blender/windowmanager/widgets/widget_library/arrow_widget.c
rename to source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
index be56c35..0be5484 100644
--- a/source/blender/windowmanager/widgets/widget_library/arrow_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/widget_library/arrow_widget.c
+/** \file blender/windowmanager/widget/widget_library/arrow_widget.c
* \ingroup wm
*
* \name Arrow Widget
@@ -55,8 +55,8 @@
#include "WM_api.h"
#include "widget_geometry.h"
-#include "../wm_widgets.h"
-#include "../wm_widgets_intern.h"
+#include "../wm_widget_intern.h"
+#include "../../wm_widget_wmapi.h"
/* to use custom arrows exported to arrow_widget.c */
diff --git a/source/blender/windowmanager/widgets/widget_library/cage_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
similarity index 99%
rename from source/blender/windowmanager/widgets/widget_library/cage_widget.c
rename to source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
index 46ec67e..3a09d33 100644
--- a/source/blender/windowmanager/widgets/widget_library/cage_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/widget_library/cage_widget.c
+/** \file blender/windowmanager/widget/widget_library/cage_widget.c
* \ingroup wm
*
* \name Cage Widget
@@ -50,8 +50,8 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "../wm_widgets.h"
-#include "../wm_widgets_intern.h"
+#include "../wm_widget_intern.h"
+#include "../../wm_widget_wmapi.h"
/* wmWidget->highlighted_part */
diff --git a/source/blender/windowmanager/widgets/widget_library/dial_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
similarity index 95%
rename from source/blender/windowmanager/widgets/widget_library/dial_widget.c
rename to source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
index ebfeaba..797c64e 100644
--- a/source/blender/windowmanager/widgets/widget_library/dial_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/widget_library/dial_widget.c
+/** \file blender/windowmanager/widget/widget_library/dial_widget.c
* \ingroup wm
*
* \name Dial Widget
@@ -49,10 +49,11 @@
#include "MEM_guardedalloc.h"
#include "widget_geometry.h"
-#include "../WM_widgets_api.h"
-#include "../WM_widgets_types.h"
-#include "../wm_widgets.h"
-#include "../wm_widgets_intern.h"
+#include "../wm_widget_intern.h"
+#include "../../WM_widget_api.h"
+#include "../../WM_widget_types.h"
+#include "../../WM_widget_library.h"
+#include "../../wm_widget_wmapi.h"
/* to use custom dials exported to dial_widget.c */
diff --git a/source/blender/windowmanager/widgets/widget_library/facemap_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
similarity index 93%
rename from source/blender/windowmanager/widgets/widget_library/facemap_widget.c
rename to source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
index 4670ad0..f591b6b 100644
--- a/source/blender/windowmanager/widgets/widget_library/facemap_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
@@ -23,7 +23,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/windowmanager/widgets/widget_library/facemap_widget.c
+/** \file blender/windowmanager/widget/widget_library/facemap_widget.c
* \ingroup wm
*
* \name Facemap Widget
@@ -52,10 +52,11 @@
#include "MEM_guardedalloc.h"
#include "widget_geometry.h"
-#include "../WM_widgets_api.h"
-#include "../WM_widgets_types.h"
-#include "../wm_widgets.h"
-#include "../wm_widgets_intern.h"
+#include "../wm_widget_intern.h"
+#include "../../WM_widget_api.h"
+#include "../../WM_widget_types.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list