Undo revision 23130 which was a merge with 2.5, a messy one because I did something wrong (`svn status` output: http://www.pasteall.org/7887).soc-2009-kazanbas

The command: svn merge -r 23130:23129 https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-kazanbas

1 files changed, 18 insertions, 40 deletions

diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index 806f5409b0a..00e9f6a2fa2 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -130,10 +130,10 @@ typedef struct wmNotifier {
 #define	NC_BRUSH			(11<<24)
 #define	NC_TEXT				(12<<24)
 #define NC_WORLD			(13<<24)
-#define NC_ANIMATION		(14<<24)
-#define NC_SPACE			(15<<24)
-#define NC_NODE				(15<<24)
-#define	NC_GEOM				(16<<24)
+#define NC_FILE				(14<<24)
+#define NC_ANIMATION		(15<<24)
+#define NC_CONSOLE			(16<<24)
+#define NC_NODE				(17<<24)
 
 /* data type, 256 entries is enough, it can overlap */
 #define NOTE_DATA			0x00FF0000
@@ -148,7 +148,6 @@ typedef struct wmNotifier {
 #define ND_SCREENDELETE		(2<<16)
 #define ND_SCREENCAST		(3<<16)
 #define ND_ANIMPLAY			(4<<16)
-#define ND_GPENCIL			(5<<16)
 
 	/* NC_SCENE Scene */
 #define ND_SCENEBROWSE		(1<<16)
@@ -171,12 +170,13 @@ typedef struct wmNotifier {
 #define ND_POSE				(18<<16)
 #define ND_BONE_ACTIVE		(19<<16)
 #define ND_BONE_SELECT		(20<<16)
-#define ND_DRAW				(21<<16)
-#define ND_MODIFIER			(22<<16) /* modifiers edited */
-#define ND_KEYS				(23<<16)
-#define ND_CONSTRAINT		(24<<16) /* constraints edited */
-#define ND_PARTICLE_DATA	(25<<16) /* particles edited */
-#define ND_PARTICLE_SELECT	(26<<16) /* particles selecting change */
+#define ND_GEOM_SELECT		(21<<16)
+#define ND_DRAW				(22<<16)
+#define ND_MODIFIER			(23<<16)
+#define ND_KEYS				(24<<16)
+#define ND_GEOM_DATA		(25<<16)
+#define ND_CONSTRAINT		(26<<16)
+#define ND_PARTICLE			(27<<16)
 
 	/* NC_MATERIAL Material */
 #define	ND_SHADING			(30<<16)
@@ -191,6 +191,10 @@ typedef struct wmNotifier {
 #define ND_CURSOR			(50<<16)
 #define ND_DISPLAY			(51<<16)
 	
+	/* NC_FILE Filebrowser */
+#define ND_PARAMS			(60<<16)
+#define ND_FILELIST			(61<<16)
+
 	/* NC_ANIMATION Animato */
 #define ND_KEYFRAME_SELECT	(70<<16)
 #define ND_KEYFRAME_EDIT	(71<<16)
@@ -201,28 +205,9 @@ typedef struct wmNotifier {
 #define ND_NLA_EDIT			(76<<16)
 #define ND_NLA_ACTCHANGE	(77<<16)
 
-	/* NC_GEOM Geometry */
-	/* Mesh, Curve, MetaBall, Armature, .. */
-#define ND_SELECT			(80<<16)
-#define ND_DATA				(81<<16)
-
-	/* NC_SPACE */
-#define ND_SPACE_CONSOLE		(1<<16) /* general redraw */
-#define ND_SPACE_CONSOLE_REPORT	(2<<16) /* update for reports, could specify type */
-#define ND_SPACE_INFO			(2<<16)
-#define ND_SPACE_IMAGE			(3<<16)
-#define ND_SPACE_FILE_PARAMS	(4<<16)
-#define ND_SPACE_FILE_LIST		(5<<16)
-#define ND_SPACE_NODE			(6<<16)
-#define ND_SPACE_OUTLINER		(7<<16)
-#define ND_SPACE_VIEW3D			(8<<16)
-#define ND_SPACE_PROPERTIES		(9<<16)
-#define ND_SPACE_TEXT			(10<<16)
-#define ND_SPACE_TIME			(11<<16)
-#define ND_SPACE_GRAPH			(12<<16)
-#define ND_SPACE_DOPESHEET		(13<<16)
-#define ND_SPACE_NLA			(14<<16)
-#define ND_SPACE_SEQUENCER		(15<<16)
+	/* console */
+#define ND_CONSOLE			(78<<16) /* general redraw */
+#define ND_CONSOLE_REPORT	(79<<16) /* update for reports, could spesify type */
 
 /* subtype, 256 entries too */
 #define NOTE_SUBTYPE		0x0000FF00
@@ -297,17 +282,10 @@ typedef struct wmTimer {
 	double delta;			/* time since previous step in seconds */
 	
 	double ltime;			/* internal, last time timer was activated */
-	double ntime;			/* internal, next time we want to activate the timer */
-	double stime;			/* internal, when the timer started */
 	int sleep;				/* internal, put timers to sleep when needed */
 } wmTimer;
 
 
-/* **************** Paint Cursor ******************* */
-
-typedef void (*wmPaintCursorDraw)(struct bContext *C, int, int, void *customdata);
-
-
 /* ****************** Messages ********************* */
 
 enum {