[Bf-blender-cvs] [9e48cafd6d] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 9e48cafd6d6a3512a41e98e71d957923fbf3cb1d
Author: Sergey Sharybin
Date:   Thu Jan 26 17:02:28 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB9e48cafd6d6a3512a41e98e71d957923fbf3cb1d

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 58cc06ddec,c9ea077e6f..b0fe5cf93a
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1521,28 -1570,23 +1570,46 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 	}
+ }
+ 
+ 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
  	}
 +
 +	{
 +		if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
 +			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->debug.background = V3D_DEBUG_BACKGROUND_NONE;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }