[Bf-blender-cvs] [e611409] multiview: Merge remote-tracking branch 'upstream/master' into multiview

[Dalai Felinto]

Commit: e61140906834849975d032f5ba25464f46e20d3d
Author: Dalai Felinto
Date:   Tue May 27 22:32:30 2014 -0300
https://developer.blender.org/rBe61140906834849975d032f5ba25464f46e20d3d

Merge remote-tracking branch 'upstream/master' into multiview

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 4b8e1b8,00fcd2d..9dd877f
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -294,52 -291,9 +294,60 @@@ void blo_do_versions_270(FileData *fd, 
  
  	{
  		Scene *scene;
+ 		for (scene = main->scene.first; scene; scene = scene->id.next) {
+ 			int num_layers = BLI_countlist(&scene->r.layers);
+ 			scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1);
+ 		}
+ 	}
++
++	{
 +		SceneRenderView *srv;
 +		Camera *cam;
 +		bScreen *screen;
++		Scene *scene;
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "ListBase", "views")) {
 +			for (scene = main->scene.first; scene; scene = scene->id.next) {
 +				BKE_scene_add_render_view(scene, STEREO_LEFT_NAME);
 +				srv = (SceneRenderView *)scene->r.views.first;
 +				BLI_strncpy(srv->suffix, "_L", sizeof(srv->suffix));
 +
 +				BKE_scene_add_render_view(scene, STEREO_RIGHT_NAME);
 +				srv = (SceneRenderView *)scene->r.views.last;
 +				BLI_strncpy(srv->suffix, "_R", sizeof(srv->suffix));
 +			}
 +		}
 +
 +		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->stereo_camera = STEREO_3D_ID;
 +							break;
 +						}
 +						case SPACE_IMAGE:
 +						{
 +							SpaceImage *sima = (SpaceImage *) sl;
 +							sima->iuser.flag |= IMA_SHOW_STEREO;
 +							sima->iuser.passtype = SCE_PASS_COMBINED;
 +							break;
 +						}
 +					}
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "Camera", "CameraStereoSettings", "stereo")) {
 +			for (cam = main->camera.first; cam; cam = cam->id.next) {
 +				cam->stereo.interocular_distance = 0.065;
 +				cam->stereo.convergence_distance = 30.f * 0.065;
 +			}
 +		}
 +	}
  }