[Bf-blender-cvs] [ef7755b] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: ef7755bacb376d7ae2dfdada5f46afdf7804aa1a
Author: Antony Riakiotakis
Date:   Thu Mar 26 17:54:47 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBef7755bacb376d7ae2dfdada5f46afdf7804aa1a

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/editors/space_sequencer/sequencer_intern.h
index d426ed6,461c729..37b801d
--- a/source/blender/editors/space_sequencer/sequencer_intern.h
+++ b/source/blender/editors/space_sequencer/sequencer_intern.h
@@@ -131,10 -131,8 +131,10 @@@ void SEQUENCER_OT_copy(struct wmOperato
  void SEQUENCER_OT_paste(struct wmOperatorType *ot);
  
  void SEQUENCER_OT_rebuild_proxy(struct wmOperatorType *ot);
- void SEQUENCER_OT_copy_proxy_settings(struct wmOperatorType *ot);
+ void SEQUENCER_OT_enable_proxies(struct wmOperatorType *ot);
  
 +void SEQUENCER_OT_overdrop_transform(struct wmOperatorType *ot);
 +
  /* preview specific operators */
  void SEQUENCER_OT_view_all_preview(struct wmOperatorType *ot);
  
diff --cc source/blender/makesdna/DNA_sequence_types.h
index db07dcd,9a6d8a5..380bfd1
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@@ -210,15 -208,12 +210,16 @@@ typedef struct Editing 
  	
  	/* Context vars, used to be static */
  	Sequence *act_seq;
 +
 +	/* new data */
 +	ListBase nstripbase;
 +	
  	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;