[Bf-blender-cvs] [d3ffaa8e523] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: d3ffaa8e5238bcd764f31c32ded8e2003c981c5f
Author: Pablo Dobarro
Date:   Mon Apr 5 18:22:38 2021 +0200
Branches: sculpt-dev
https://developer.blender.org/rBd3ffaa8e5238bcd764f31c32ded8e2003c981c5f

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 1943e4e5fa7,c9f93d35eb3..af2bcfc4da2
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1949,17 -2000,59 +2001,71 @@@ void blo_do_versions_290(FileData *fd, 
     */
    {
      /* Keep this block, even when empty. */
 +    LISTBASE_FOREACH (Brush *, br, &bmain->brushes) {
 +      BKE_brush_default_input_curves_set(br);
 +    }
 +
 +    if (!DNA_struct_elem_find(fd->filesdna, "Sculpt", "float", "smooth_strength_factor")) {
 +      LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
 +        Sculpt *sd = scene->toolsettings->sculpt;
 +        if (sd) {
 +          sd->smooth_strength_factor = 1.0f;
 +        }
 +      }
 +    }
+ 
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         version_node_socket_name(ntree, GEO_NODE_VOLUME_TO_MESH, "Grid", "Density");
+       }
+     }
+     FOREACH_NODETREE_END;
+ 
+     if (!DNA_struct_elem_find(fd->filesdna, "bArmature", "float", "axes_position")) {
+       /* Convert the axes draw position to its old default (tip of bone). */
+       LISTBASE_FOREACH (struct bArmature *, arm, &bmain->armatures) {
+         arm->axes_position = 1.0;
+       }
+     }
+ 
+     /* Initialize the spread parameter for area lights*/
+     if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "area_spread")) {
+       LISTBASE_FOREACH (Light *, la, &bmain->lights) {
+         la->area_spread = DEG2RADF(180.0f);
+       }
+     }
+ 
+     LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+         LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+           if (sl->spacetype == SPACE_NODE) {
+             SpaceNode *snode = (SpaceNode *)sl;
+             LISTBASE_FOREACH (bNodeTreePath *, path, &snode->treepath) {
+               STRNCPY(path->display_name, path->node_name);
+             }
+           }
+         }
+       }
+     }
+ 
+     /* The CU_2D flag has been removed. */
+     LISTBASE_FOREACH (Curve *, cu, &bmain->curves) {
+ #define CU_2D (1 << 3)
+       ListBase *nurbs = BKE_curve_nurbs_get(cu);
+       bool is_2d = true;
+ 
+       LISTBASE_FOREACH (Nurb *, nu, nurbs) {
+         if (nu->flag & CU_2D) {
+           nu->flag &= ~CU_2D;
+         }
+         else {
+           is_2d = false;
+         }
+       }
+ #undef CU_2D
+       if (!is_2d && CU_IS_2D(cu)) {
+         cu->flag |= CU_3D;
+       }
+     }
    }
  }