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

[Bastien Montagne]

Commit: b46b2834b9596b9a7c026dd2e041a329cda9bb59
Author: Bastien Montagne
Date:   Thu Feb 23 10:56:28 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBb46b2834b9596b9a7c026dd2e041a329cda9bb59

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 3bd84c5f5c,7106cf6072..12045dfdb8
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1575,30 -1575,30 +1575,53 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  
+ 		/* Fix for T50736, Glare comp node using same var for two different things. */
+ 		if (!DNA_struct_elem_find(fd->filesdna, "NodeGlare", "char", "star_45")) {
+ 			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_GLARE) {
+ 							NodeGlare *ndg = node->storage;
+ 							switch (ndg->type) {
+ 								case 2:  /* Grrrr! magic numbers :( */
+ 									ndg->streaks = ndg->angle;
+ 									break;
+ 								case 0:
+ 									ndg->star_45 = ndg->angle != 0;
+ 									break;
+ 								default:
+ 									break;
+ 							}
+ 						}
+ 					}
+ 				}
+ 			} 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;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
  
  void do_versions_after_linking_270(Main *main)