1 files changed, 17 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index a7718883438..375641d1115 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -30,6 +30,7 @@
 #ifndef __DNA_SCREEN_TYPES_H__
 #define __DNA_SCREEN_TYPES_H__
 
+#include "DNA_defs.h"
 #include "DNA_listBase.h"
 #include "DNA_view2d_types.h"
 #include "DNA_vec_types.h"
@@ -46,6 +47,7 @@ struct uiLayout;
 struct wmTimer;
 struct wmTooltipState;
 
+
 typedef struct bScreen {
 	ID id;
 	
@@ -53,10 +55,9 @@ typedef struct bScreen {
 	ListBase edgebase;
 	ListBase areabase;
 	ListBase regionbase;				/* screen level regions (menus), runtime only */
-	
-	struct Scene *scene;
-	struct Scene *newscene;				/* temporary when switching */
-	
+
+	struct Scene *scene DNA_DEPRECATED;
+
 	short winid;						/* winid from WM, starts with 1 */
 	short redraws_flag;					/* user-setting for which editors get redrawn during anim playback (used to be time->redraws) */
 
@@ -79,6 +80,8 @@ typedef struct bScreen {
 	void *context;						/* context callback */
 
 	struct wmTooltipState *tool_tip;	/* runtime */
+
+	PreviewImage *preview;
 } bScreen;
 
 typedef struct ScrVert {
@@ -194,6 +197,13 @@ typedef struct uiList {           /* some list UI data need to be saved in file
 	uiListDyn *dyn_data;
 } uiList;
 
+typedef struct TransformOrientation {
+	struct TransformOrientation *next, *prev;
+	char name[64];	/* MAX_NAME */
+	float mat[3][3];
+	int pad;
+} TransformOrientation;
+
 typedef struct uiPreview {           /* some preview UI data need to be saved in file */
 	struct uiPreview *next, *prev;
 
@@ -268,9 +278,10 @@ typedef struct ARegion {
 	ListBase ui_previews;		/* uiPreview */
 	ListBase handlers;			/* wmEventHandler */
 	ListBase panels_category;	/* Panel categories runtime */
-	
+
+	struct wmManipulatorMap *manipulator_map; /* manipulator-map of this region */
 	struct wmTimer *regiontimer; /* blend in/out */
-	
+
 	char *headerstr;			/* use this string to draw info */
 	void *regiondata;			/* XXX 2.50, need spacedata equivalent? */
 } ARegion;