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

[Antony Riakiotakis]

Commit: c29d7a2c2b056f9b432a6c6841b78353c6d267a9
Author: Antony Riakiotakis
Date:   Tue Apr 7 16:17:16 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBc29d7a2c2b056f9b432a6c6841b78353c6d267a9

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index aa4e53f,1b91d3d..1ab1154
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -852,51 -708,6 +852,29 @@@ void blo_do_versions_270(FileData *fd, 
  		} FOREACH_NODETREE_END
  	}
  
- 	if (!DNA_struct_elem_find(fd->filesdna, "Sequence", "char", "storage")) {
- 		Scene *scene;
- 		Sequence *seq;
- 
- #define SEQ_USE_PROXY_CUSTOM_DIR (1 << 19)
- #define SEQ_USE_PROXY_CUSTOM_FILE (1 << 21)
- 
- 		for (scene = main->scene.first; scene; scene = scene->id.next) {
- 			SEQ_BEGIN (scene->ed, seq) {
- 				if (seq->strip && seq->strip->proxy) {
- 					if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR)
- 						seq->strip->proxy->storage = SEQ_STORAGE_PROXY_CUSTOM_DIR;
- 					if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE)
- 						seq->strip->proxy->storage = SEQ_STORAGE_PROXY_CUSTOM_FILE;
- 				}
- 			}
- 			SEQ_END
- 		}
- #undef SEQ_USE_PROXY_CUSTOM_DIR
- #undef SEQ_USE_PROXY_CUSTOM_FILE
- 	}
- 
 +	{
 +		bScreen *scr;
 +		ScrArea *sa;
 +		SpaceLink *sl;
 +		ARegion *ar;
 +		/* Make sure sequencer preview area limits zoom */
 +		for (scr = main->screen.first; scr; scr = scr->id.next) {
 +			for (sa = scr->areabase.first; sa; sa = sa->next) {
 +				for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +					if (sl->spacetype == SPACE_SEQ) {
 +						ListBase *lb = (sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
 +
 +						for (ar = lb->first; ar; ar = ar->next) {
 +							if (ar->regiontype == RGN_TYPE_WINDOW) {
 +								ar->v2d.max[1] = MAXSEQ * 4;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
 +
  	if (!MAIN_VERSION_ATLEAST(main, 274, 4)) {
  		SceneRenderView *srv;
  		wmWindowManager *wm;
@@@ -920,11 -731,18 +898,23 @@@
  			SEQ_BEGIN (scene->ed, seq)
  			{
  				seq->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format");
 +				/* patch sequencer scene strips (used to be the same flag before multiview merge)*/
 +				if (seq->flag & SEQ_USE_VIEWS) {
 +					seq->flag |= SEQ_SCENE_STRIPS;
 +					seq->flag &= ~SEQ_USE_VIEWS;
 +				}
+ 
+ #define SEQ_USE_PROXY_CUSTOM_DIR (1 << 19)
+ #define SEQ_USE_PROXY_CUSTOM_FILE (1 << 21)
+ 				if (seq->strip && seq->strip->proxy && !seq->strip->proxy->storage) {
+ 					if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR)
+ 						seq->strip->proxy->storage = SEQ_STORAGE_PROXY_CUSTOM_DIR;
+ 					if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE)
+ 						seq->strip->proxy->storage = SEQ_STORAGE_PROXY_CUSTOM_FILE;
+ 				}
+ #undef SEQ_USE_PROXY_CUSTOM_DIR
+ #undef SEQ_USE_PROXY_CUSTOM_FILE
+ 
  			}
  			SEQ_END
  		}
diff --cc source/blender/editors/space_view3d/view3d_ops.c
index d1b50b1,6a2c948..32feac5
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@@ -384,10 -384,10 +384,10 @@@ void view3d_keymap(wmKeyConfig *keyconf
  	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", EIGHTKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 8);
  	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", NINEKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 9);
  	RNA_int_set(WM_keymap_add_item(keymap, "VIEW3D_OT_layers", ZEROKEY, KM_PRESS, KM_ANY, 0)->ptr, "nr", 10);
 -	
 +
  	/* drawtype */
  
- 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_CLICK, 0, 0);
+ 	kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle_enum", ZKEY, KM_PRESS, 0, 0);
  	RNA_string_set(kmi->ptr, "data_path", "space_data.viewport_shade");
  	RNA_string_set(kmi->ptr, "value_1", "SOLID");
  	RNA_string_set(kmi->ptr, "value_2", "WIREFRAME");