[Bf-blender-cvs] [306732e] multiview: Merge remote-tracking branch 'origin/master' into multiview

Dalai Felinto noreply at git.blender.org
Thu Sep 25 21:23:16 CEST 2014


Commit: 306732ec560cb2a1ca5fe41ee03b9adb1a088c06
Author: Dalai Felinto
Date:   Thu Sep 25 20:21:06 2014 +0200
Branches: multiview
https://developer.blender.org/rB306732ec560cb2a1ca5fe41ee03b9adb1a088c06

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

Conflicts:
	release/datafiles/locale
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc intern/cycles/blender/blender_camera.cpp
index 9dcc607,016f663..7e51c6e
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@@ -555,10 -551,11 +556,11 @@@ void BlenderSync::sync_view(BL::SpaceVi
  {
  	BlenderCamera bcam;
  	blender_camera_init(&bcam, b_scene.render(), b_scene);
 -	blender_camera_from_view(&bcam, b_scene, b_v3d, b_rv3d, width, height);
 -	blender_camera_border(&bcam, b_scene.render(), b_scene, b_v3d, b_rv3d, width, height);
 +	blender_camera_from_view(&bcam, b_engine, b_scene, b_v3d, b_rv3d, width, height);
 +	blender_camera_border(&bcam, b_engine, b_scene.render(), b_scene, b_v3d, b_rv3d, width, height);
  
  	blender_camera_sync(scene->camera, &bcam, width, height);
+ 	scene->camera->use_camera_in_volume = experimental;
  }
  
  BufferParams BlenderSync::get_buffer_params(BL::RenderSettings b_render, BL::Scene b_scene, BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, Camera *cam, int width, int height)
diff --cc release/datafiles/locale
index a9a4c6e,841b1b9..18bf273
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit a9a4c6e84c31fc4d3f21f75e714816e8a2261cf8
 -Subproject commit 841b1b9f494b6f980da4e244bbd86ecb8a8ac0b7
++Subproject commit 18bf273c38b0d52429274159f1d4d4d00be59e30
diff --cc source/blender/blenloader/intern/versioning_270.c
index 05dc426,67d51ab..465afc9
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -380,90 -368,12 +373,99 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 272, 0)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "int", "preview_start_resolution")) {
+ 			Scene *scene;
+ 			for (scene = main->scene.first; scene; scene = scene->id.next) {
+ 				scene->r.preview_start_resolution = 64;
+ 			}
+ 		}
+ 	}
++
 +	{
 +		if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "ListBase", "views")) {
 +			Scene *scene;
 +			SceneRenderView *srv;
 +			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));
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "View3D", "char", "stereo_camera")) {
 +			bScreen *screen;
 +			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;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "Camera", "CameraStereoSettings", "stereo")) {
 +			Camera *cam;
 +			for (cam = main->camera.first; cam; cam = cam->id.next) {
 +				cam->stereo.interocular_distance = 0.065;
 +				cam->stereo.convergence_distance = 30.f * 0.065;
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "Image", "Stereo3dFormat", "*stereo3d_format")) {
 +			Image *ima;
 +			for (ima = main->image.first; ima; ima = ima->id.next) {
 +				ima->stereo3d_format = MEM_callocN(sizeof(Stereo3dFormat), "Image Stereo 3d Format");
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "Image", "ListBase", "packedfiles")) {
 +			Image *ima;
 +			for (ima = main->image.first; ima; ima = ima->id.next) {
 +				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;
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "wmWindow", "Stereo3dFormat", "*stereo3d_format")) {
 +			wmWindowManager *wm;
 +			wmWindow *win;
 +
 +			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");
 +				}
 +			}
 +		}
 +	}
  }




More information about the Bf-blender-cvs mailing list