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

[Campbell Barton]

Commit: a79361ec36fbc19d0de1b5e5953e10cbb6a42ced
Author: Campbell Barton
Date:   Tue Jan 5 03:06:33 2016 +1100
Branches: wiggly-widgets
https://developer.blender.org/rBa79361ec36fbc19d0de1b5e5953e10cbb6a42ced

Merge branch 'master' into wiggly-widgets

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index ffc50cd,b975a39..f436dd9
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1036,43 -1037,17 +1037,57 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  	}
+ 	if (!MAIN_VERSION_ATLEAST(main, 276, 5)) {
+ 		ListBase *lbarray[MAX_LIBARRAY];
+ 		int a;
+ 
+ 		/* Important to clear all non-persistent flags from older versions here, otherwise they could collide
+ 		 * with any new persistent flag we may add in the future. */
+ 		a = set_listbasepointers(main, lbarray);
+ 		while (a--) {
+ 			for (ID *id = lbarray[a]->first; id; id = id->next) {
+ 				id->flag &= LIB_FAKEUSER;
+ 			}
+ 		}
+ 	}
++
 +
 +	{
 +		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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }