[Bf-blender-cvs] [d3173f5] wiggly-widgets: Avoid relative includes

[Julian Eisel]

Commit: d3173f5d4c4abfe352565a94f6347b69c30400e2
Author: Julian Eisel
Date:   Tue Feb 9 17:27:21 2016 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBd3173f5d4c4abfe352565a94f6347b69c30400e2

Avoid relative includes

===================================================================

M	source/blender/windowmanager/CMakeLists.txt
M	source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
M	source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
M	source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
M	source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
M	source/blender/windowmanager/widgets/intern/widget_library/plane_widget.c
M	source/blender/windowmanager/widgets/intern/wm_widget.c
M	source/blender/windowmanager/widgets/intern/wm_widgetgroup.c
M	source/blender/windowmanager/widgets/intern/wm_widgetmap.c

===================================================================

diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 2575d05..12a297d 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -25,6 +25,8 @@
 
 set(INC
 	.
+	widgets
+	widgets/intern
 	../blenfont
 	../blenkernel
 	../blenlib
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
index bcfc7f4..e379a33 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
@@ -54,9 +54,10 @@
 #include "WM_types.h"
 #include "WM_api.h"
 
+/* own includes */
+#include "wm_widget_wmapi.h"
+#include "wm_widget_intern.h"
 #include "widget_geometry.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/intern/widget_library/cage_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
index e5615b3..bc2a09c 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
@@ -50,8 +50,9 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "../wm_widget_intern.h"
-#include "../../wm_widget_wmapi.h"
+/* own includes */
+#include "wm_widget_wmapi.h"
+#include "wm_widget_intern.h"
 
 
 /* wmWidget->highlighted_part */
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
index a980403..33972d7 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/dial_widget.c
@@ -48,12 +48,13 @@
 
 #include "MEM_guardedalloc.h"
 
+/* own includes */
+#include "WM_widget_api.h"
+#include "WM_widget_types.h"
+#include "WM_widget_library.h"
+#include "wm_widget_wmapi.h"
+#include "wm_widget_intern.h"
 #include "widget_geometry.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/intern/widget_library/facemap_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
index 0b4e5e4..0328827 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/facemap_widget.c
@@ -51,12 +51,13 @@
 
 #include "MEM_guardedalloc.h"
 
+/* own includes */
+#include "WM_widget_api.h"
+#include "WM_widget_types.h"
+#include "WM_widget_library.h"
+#include "wm_widget_wmapi.h"
+#include "wm_widget_intern.h"
 #include "widget_geometry.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"
 
 
 typedef struct FacemapWidget {
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/plane_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/plane_widget.c
index f07dcfd..b1974d5 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/plane_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/plane_widget.c
@@ -44,11 +44,12 @@
 
 #include "MEM_guardedalloc.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"
+/* own includes */
+#include "WM_widget_api.h"
+#include "WM_widget_types.h"
+#include "WM_widget_library.h"
+#include "wm_widget_wmapi.h"
+#include "wm_widget_intern.h"
 
 
 /* PlaneWidget->flag */
diff --git a/source/blender/windowmanager/widgets/intern/wm_widget.c b/source/blender/windowmanager/widgets/intern/wm_widget.c
index 3cbcb4f..2d44d67 100644
--- a/source/blender/windowmanager/widgets/intern/wm_widget.c
+++ b/source/blender/windowmanager/widgets/intern/wm_widget.c
@@ -51,7 +51,8 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "../wm_widget_wmapi.h"
+/* own includes */
+#include "wm_widget_wmapi.h"
 #include "wm_widget_intern.h"
 
 /**
diff --git a/source/blender/windowmanager/widgets/intern/wm_widgetgroup.c b/source/blender/windowmanager/widgets/intern/wm_widgetgroup.c
index 7528f57..f724eee 100644
--- a/source/blender/windowmanager/widgets/intern/wm_widgetgroup.c
+++ b/source/blender/windowmanager/widgets/intern/wm_widgetgroup.c
@@ -54,7 +54,8 @@
 #include "WM_types.h"
 #include "wm_event_system.h"
 
-#include "../wm_widget_wmapi.h"
+/* own includes */
+#include "wm_widget_wmapi.h"
 #include "wm_widget_intern.h"
 
 
diff --git a/source/blender/windowmanager/widgets/intern/wm_widgetmap.c b/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
index fac9201..425d81b 100644
--- a/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
+++ b/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
@@ -51,7 +51,8 @@
 #include "WM_types.h"
 #include "wm_event_system.h"
 
-#include "../wm_widget_wmapi.h"
+/* own includes */
+#include "wm_widget_wmapi.h"
 #include "wm_widget_intern.h"
 
 /**