[Bf-blender-cvs] [8c01b2da98c] custom-manipulators: Minor sync with master

Campbell Barton noreply at git.blender.org
Thu Apr 6 12:12:25 CEST 2017


Commit: 8c01b2da98cc375601e3ae89578177c9480a0c5b
Author: Campbell Barton
Date:   Thu Apr 6 20:12:55 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB8c01b2da98cc375601e3ae89578177c9480a0c5b

Minor sync with master

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

M	source/blender/windowmanager/WM_types.h
M	source/blender/windowmanager/wm.h

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

diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 827b1003270..84209a0e3c8 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -108,8 +108,6 @@ extern "C" {
 
 struct bContext;
 struct wmEvent;
-struct wmKeyMap;
-struct wmKeyConfig;
 struct wmWindowManager;
 struct wmOperator;
 struct ImBuf;
@@ -688,7 +686,6 @@ typedef struct wmDropBox {
 
 } wmDropBox;
 
-
 /* *************** migrated stuff, clean later? ************** */
 
 typedef struct RecentFile {
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index b02f8264b33..f63246580ea 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -33,13 +33,6 @@
 
 struct wmWindow;
 struct ReportList;
-struct wmEvent;
-struct wmOperatorType;
-struct PointerRNA;
-struct PropertyRNA;
-struct wmOperator;
-
-#include "manipulators/wm_manipulator_wmapi.h" /* manipulators wm API */
 
 #include "manipulators/wm_manipulator_wmapi.h"
 
@@ -52,7 +45,6 @@ typedef struct wmPaintCursor {
 	void (*draw)(bContext *C, int, int, void *customdata);
 } wmPaintCursor;
 
-
 extern void wm_close_and_free(bContext *C, wmWindowManager *);
 extern void wm_close_and_free_all(bContext *C, ListBase *);
 
@@ -99,7 +91,6 @@ void wm_stereo3d_set_cancel(bContext *C, wmOperator *op);
 void wm_open_init_load_ui(wmOperator *op, bool use_prefs);
 void wm_open_init_use_scripts(wmOperator *op, bool use_prefs);
 
-
 /* hack to store circle select size - campbell, must replace with nice operator memory */
 #define GESTURE_MEMORY




More information about the Bf-blender-cvs mailing list