Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jan 2017 16:02:28 +0000 (17:02 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jan 2017 16:02:28 +0000 (17:02 +0100)
1  2 
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
source/blender/editors/space_node/drawnode.c

index 58cc06ddec63df3df9a3a195031d068dbfddcfe2,c9ea077e6f675350d5f37eb308107e267ebb8628..b0fe5cf93add9c6994e467e4b7715572d19a8f96
@@@ -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;
 +                                                      }
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +      }
  }