[Bf-blender-cvs] [47d37c5] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 47d37c568e0ecb8f555a757eae8e9122da3cbab4
Author: Julian Eisel
Date:   Mon Apr 6 23:43:31 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB47d37c568e0ecb8f555a757eae8e9122da3cbab4

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/blenloader/intern/versioning_270.c
	source/blender/makesdna/DNA_view3d_types.h
	source/blender/windowmanager/CMakeLists.txt
	source/blender/windowmanager/intern/wm_operators.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 7cf8795,3201a81..4533de0
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -725,25 -730,84 +730,105 @@@ void blo_do_versions_270(FileData *fd, 
  #undef SEQ_USE_PROXY_CUSTOM_FILE
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 274, 4))
+ 	{
+ 		SceneRenderView *srv;
+ 		wmWindowManager *wm;
+ 		bScreen *screen;
+ 		wmWindow *win;
+ 		Scene *scene;
+ 		Camera *cam;
+ 		Image *ima;
+ 
+ 		for (scene = main->scene.first; scene; scene = scene->id.next) {
+ 			Sequence *seq;
+ 
+ 			BKE_scene_add_render_view(scene, STEREO_LEFT_NAME);
+ 			srv = scene->r.views.first;
+ 			BLI_strncpy(srv->suffix, STEREO_LEFT_SUFFIX, sizeof(srv->suffix));
+ 
+ 			BKE_scene_add_render_view(scene, STEREO_RIGHT_NAME);
+ 			srv = scene->r.views.last;
+ 			BLI_strncpy(srv->suffix, STEREO_RIGHT_SUFFIX, sizeof(srv->suffix));
+ 
+ 			SEQ_BEGIN (scene->ed, seq)
+ 			{
+ 				seq->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format");
+ 			}
+ 			SEQ_END
+ 		}
+ 
+ 		for (screen = main->screen.first; screen; screen = screen->id.next) {
+ 			ScrArea *sa;
+ 			for (sa = screen->areabase.first; sa; sa = sa->next) {
+ 				SpaceLink *sl;
+ 
+ 				for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ 					switch (sl->spacetype) {
+ 						case SPACE_VIEW3D:
+ 						{
+ 							View3D *v3d = (View3D *)sl;
+ 							v3d->stereo3d_camera = STEREO_3D_ID;
+ 							v3d->stereo3d_flag |= V3D_S3D_DISPPLANE;
+ 							v3d->stereo3d_convergence_alpha = 0.15f;
+ 							v3d->stereo3d_volume_alpha = 0.05f;
+ 							break;
+ 						}
+ 						case SPACE_IMAGE:
+ 						{
+ 							SpaceImage *sima = (SpaceImage *) sl;
+ 							sima->iuser.flag |= IMA_SHOW_STEREO;
+ 							sima->iuser.passtype = SCE_PASS_COMBINED;
+ 							break;
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 
+ 		for (cam = main->camera.first; cam; cam = cam->id.next) {
+ 			cam->stereo.interocular_distance = 0.065;
+ 			cam->stereo.convergence_distance = 30.f * 0.065;
+ 		}
+ 
+ 		for (ima = main->image.first; ima; ima = ima->id.next) {
+ 			ima->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Image Stereo 3d Format");
+ 
+ 			if (ima->packedfile) {
+ 				ImagePackedFile *imapf = MEM_mallocN(sizeof(ImagePackedFile), "Image Packed File");
+ 				BLI_addtail(&ima->packedfiles, imapf);
+ 
+ 				imapf->packedfile = ima->packedfile;
+ 				BLI_strncpy(imapf->filepath, ima->name, FILE_MAX);
+ 				ima->packedfile = NULL;
+ 			}
+ 		}
+ 
+ 		for (wm = main->wm.first; wm; wm = wm->id.next) {
+ 			for (win = wm->windows.first; win; win = win->next) {
+ 				win->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Stereo Display 3d Format");
+ 			}
+ 		}
+ 	}
 +	if (!MAIN_VERSION_ATLEAST(main, 275, 0)) {
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float", "backdrop_zoom")) {
 +			bScreen *sc;
 +			for (sc = main->screen.first; sc; sc = sc->id.next) {
 +				ScrArea *sa;
 +				for (sa = sc->areabase.first; sa; sa = sa->next) {
 +					SpaceLink *sl;
 +					for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_NODE) {
 +							SpaceNode *snode = (SpaceNode *)sl;
 +							snode->backdrop_zoom = 1.0;
 +						}
 +						if (sl->spacetype == SPACE_SEQ) {
 +							SpaceSeq *sseq = (SpaceSeq *)sl;
 +							sseq->overdrop_zoom = 1.0;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
diff --cc source/blender/windowmanager/CMakeLists.txt
index df58263,86f5fff..75df966
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@@ -64,10 -64,7 +64,11 @@@ set(SR
  	intern/wm_operators.c
  	intern/wm_subwindow.c
  	intern/wm_window.c
+ 	intern/wm_stereo.c
 +	intern/wm_widgets.c
 +	intern/wm_generic_widgets.c
 +	3d_widgets/arrow_widget.c
 +	3d_widgets/dial_widget.c
  
  	WM_api.h
  	WM_keymap.h
diff --cc source/blender/windowmanager/intern/wm_operators.c
index 6d94fc0,499adf5..49f7661
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@@ -4903,7 -4913,7 +4943,8 @@@ void wm_operatortype_init(void
  	WM_operatortype_append(WM_OT_call_menu);
  	WM_operatortype_append(WM_OT_call_menu_pie);
  	WM_operatortype_append(WM_OT_radial_control);
+ 	WM_operatortype_append(WM_OT_stereo3d_set);
 +	WM_operatortype_append(WM_OT_widget_tweak);
  #if defined(WIN32)
  	WM_operatortype_append(WM_OT_console_toggle);
  #endif