[Bf-blender-cvs] [04e4cb9714] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

[Julian Eisel]

Commit: 04e4cb9714d72a32a85d82a01f341a90d17a7a1e
Author: Julian Eisel
Date:   Mon Jan 30 00:16:43 2017 +0100
Branches: custom-manipulators
https://developer.blender.org/rB04e4cb9714d72a32a85d82a01f341a90d17a7a1e

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 2dbf92c544,477382d8c5..2db2fa440a
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1515,43 -1595,21 +1595,60 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  	}
 +
 +	{
 +		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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
+ 
+ void do_versions_after_linking_270(Main *main)
+ {
+ 	/* To be added to next subversion bump! */
+ 	{
+ 		FOREACH_NODETREE(main, ntree, id) {
+ 			if (ntree->type == NTREE_COMPOSIT) {
+ 				ntreeSetTypes(NULL, ntree);
+ 				for (bNode *node = ntree->nodes.first; node; node = node->next) {
+ 					if (node->type == CMP_NODE_HUE_SAT) {
+ 						do_version_hue_sat_node(ntree, node);
+ 					}
+ 				}
+ 			}
+ 		} FOREACH_NODETREE_END
+ 	}
+ }