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

[Bastien Montagne]

Commit: 44f91a9a18d6d942d958e7640f4d1c301d230150
Author: Bastien Montagne
Date:   Mon May 22 22:49:02 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB44f91a9a18d6d942d958e7640f4d1c301d230150

Merge branch 'master' into blender2.8

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index d4ba9c72aba,008ef4e60cd..881ef3a7756
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1644,26 -1644,10 +1644,31 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  
+ 		/* Fix related to VGroup modifiers creating named defgroup CD layers! See T51520. */
+ 		for (Mesh *me = main->mesh.first; me; me = me->id.next) {
+ 			CustomData_set_layer_name(&me->vdata, CD_MDEFORMVERT, 0, "");
+ 		}
++
 +		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;
 +							}
 +						}
 +					}
 +				}
 +			}
 +		}
  	}
  }