New option proxy placement, project directory.

There are two per-editor settings now, the Per-Strip setting (default)
and the Project setting.

The per strip setting basically uses the previous, per-strip options for
storing the proxies.
The project setting though will use a specified directory for -all-
proxies, or the blend file directory if no directory is given.

1 files changed, 6 insertions, 1 deletions

diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index c4de93efa6b..9a6d8a533b0 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -210,9 +210,10 @@ typedef struct Editing {
 	Sequence *act_seq;
 	char act_imagedir[1024]; /* 1024 = FILE_MAX */
 	char act_sounddir[1024]; /* 1024 = FILE_MAX */
+	char proxy_dir[1024]; /* 1024 = FILE_MAX */
 
 	int over_ofs, over_cfra;
-	int over_flag, pad;
+	int over_flag, proxy_storage;
 	rctf over_border;
 } Editing;
 
@@ -327,6 +328,10 @@ typedef struct SequencerScopes {
 #define SEQ_STRIP_OFSBOTTOM     0.2f
 #define SEQ_STRIP_OFSTOP        0.8f
 
+/* Editor->proxy_storage */
+/* store proxies in project directory */
+#define SEQ_EDIT_PROXY_DIR_STORAGE 1
+
 /* SpeedControlVars->flags */
 #define SEQ_SPEED_INTEGRATE      1
 /* #define SEQ_SPEED_BLEND          2 */ /* DEPRECATED */