Merged changes in the trunk up to revision 29702.

3 files changed, 26 insertions, 0 deletions

diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 6d73c261f23..a811fd9c014 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -152,7 +152,9 @@ typedef struct ARegion {
 	short sizex, sizey;			/* current split size in pixels (if zero it uses regiontype) */
 	
 	short do_draw;				/* private, cached notifier events */
+	short do_draw_overlay;		/* private, cached notifier events */
 	short swap;					/* private, indicator to survive swap-exchange */
+	short pad[3];
 	
 	struct ARegionType *type;	/* callbacks for this region type */
 	
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 9f395d6e876..84d8e8c8e67 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -276,6 +276,9 @@ typedef struct SpeedControlVars {
 #define SEQ_USE_PROXY_CUSTOM_FILE             2097152
 #define SEQ_USE_EFFECT_DEFAULT_FADE           4194304
 
+/* convenience define for all selection flags */
+#define SEQ_ALLSEL	(SELECT+SEQ_LEFTSEL+SEQ_RIGHTSEL)
+
 /* deprecated, dont use a flag anymore*/
 /*#define SEQ_ACTIVE                            1048576*/
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index e59cad09d6c..ba9d0380c9f 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -346,6 +346,17 @@ typedef struct SpaceScript {
 	void *but_refs;
 } SpaceScript;
 
+typedef struct SpaceTimeCache {
+	struct SpaceTimeCache *next, *prev;
+	int type;
+	int flag;
+	
+	float *array;
+	int len;
+	int startframe, endframe;
+	int ok;
+} SpaceTimeCache;
+
 typedef struct SpaceTime {
 	SpaceLink *next, *prev;
 	ListBase regionbase;		/* storage of regions for inactive spaces */
@@ -354,6 +365,9 @@ typedef struct SpaceTime {
 	
 	View2D v2d; /* deprecated, copied to region */
 	
+	ListBase caches;
+	int cache_display, pad;
+	
 	int flag, redraws;
 	
 } SpaceTime;
@@ -860,6 +874,13 @@ enum {
 #define TIME_CONTINUE_PHYSICS	128
 #define TIME_NODES				256
 
+/* time->cache */
+#define TIME_CACHE_DISPLAY		1
+#define TIME_CACHE_SOFTBODY		2
+#define TIME_CACHE_PARTICLES	4
+#define TIME_CACHE_CLOTH		8
+#define TIME_CACHE_SMOKE		16
+
 /* sseq->mainb */
 #define SEQ_DRAW_SEQUENCE         0
 #define SEQ_DRAW_IMG_IMBUF        1