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

[Dalai Felinto]

Commit: 0f56e3d6ede3231de95631ce0f9a547c9b5fe7fe
Author: Dalai Felinto
Date:   Fri May 23 10:20:55 2014 -0300
https://developer.blender.org/rB0f56e3d6ede3231de95631ce0f9a547c9b5fe7fe

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 4de22ed,7e058ae..7f18c68
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -282,53 -279,13 +282,63 @@@ void blo_do_versions_270(FileData *fd, 
  			sce->r.bake.im_format.compress = 15;
  		}
  	}
+ 
+ 	if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) {
+ 		FreestyleLineStyle *linestyle;
+ 
+ 		for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
+ 			linestyle->flag |= LS_TEXTURE;
+ 			linestyle->texstep = 1.0;
+ 		}
+ 	}
++
 +	{
 +		Scene *scene;
 +		SceneRenderView *srv;
 +		Camera *cam;
 +		bScreen *screen;
 +
 +		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;
 +							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;
 +			}
 +		}
 +	}
  }