[Bf-blender-cvs] [a11412e] cycles_panorama_experiments: Use reasonable defaults for pole merge angles

[Sergey Sharybin]

Commit: a11412e9a5983e15ff93de19ce0e3e7b15e6d918
Author: Sergey Sharybin
Date:   Tue May 17 12:50:29 2016 +0200
Branches: cycles_panorama_experiments
https://developer.blender.org/rBa11412e9a5983e15ff93de19ce0e3e7b15e6d918

Use reasonable defaults for pole merge angles

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

M	source/blender/blenkernel/intern/camera.c
M	source/blender/blenloader/intern/versioning_270.c

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

diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index bdf3432..96bac2c 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -76,6 +76,8 @@ void BKE_camera_init(Camera *cam)
 	/* stereoscopy 3d */
 	cam->stereo.interocular_distance = 0.065f;
 	cam->stereo.convergence_distance = 30.f * 0.065f;
+	cam->stereo.pole_merge_angle_from = DEG2RAD(60.0f);
+	cam->stereo.pole_merge_angle_to = DEG2RAD(75.0f);
 }
 
 void *BKE_camera_add(Main *bmain, const char *name)
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index efd167d..50915d5 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1151,4 +1151,15 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
 			}
 		}
 	}
+
+	{
+		for (Camera *camera = main->camera.first; camera != NULL; camera = camera->id.next) {
+			if (camera->stereo.pole_merge_angle_from == 0.0f &&
+			    camera->stereo.pole_merge_angle_to == 0.0f)
+			{
+				camera->stereo.pole_merge_angle_from = DEG2RAD(60.0f);
+				camera->stereo.pole_merge_angle_to = DEG2RAD(75.0f);
+			}
+		}
+	}
 }