Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 22 May 2017 20:49:02 +0000 (22:49 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 22 May 2017 20:49:02 +0000 (22:49 +0200)
Conflicts:
source/blender/blenloader/intern/versioning_270.c

13 files changed:
1  2 
CMakeLists.txt
intern/cycles/device/device_cuda.cpp
source/blender/blenlib/intern/listbase.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_text/space_text.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/intern/MOD_weightvgedit.c
source/blender/modifiers/intern/MOD_weightvgmix.c
source/blender/nodes/NOD_static_types.h

diff --cc CMakeLists.txt
Simple merge
Simple merge
index d4ba9c72abaf4bb961fa171ae24b17a8a52706e0,008ef4e60cdc36c8342b5bfe20f5fc98be383ae0..881ef3a7756b5435b94fd8c1269766dd271401bc
@@@ -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;
 +                                                      }
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
        }
  }