[Bf-blender-cvs] [53f5592] wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 53f55921c9c10be06f3cda02de623fc0f9567126
Author: Julian Eisel
Date:   Wed May 18 23:19:56 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB53f55921c9c10be06f3cda02de623fc0f9567126

Merge branch 'master' into wiggly-widgets

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 3317cf7,0ea4078..b820269
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1192,41 -1192,13 +1192,52 @@@ void blo_do_versions_270(FileData *fd, 
  	}
  
  	{
+ 		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);
+ 			}
+ 		}
+ 	}
++
++	{
 +		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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "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_IPO) {
 +							SpaceIpo *sipo = (SpaceIpo *)sl;
 +							sipo->backdrop_zoom = 1.0f;
 +							sipo->backdrop_opacity = 0.7f;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }