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

[Pablo Dobarro]

Commit: 9f78a24eca372d49c543dbb1274b54a78904ab57
Author: Pablo Dobarro
Date:   Sat Feb 27 18:32:35 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB9f78a24eca372d49c543dbb1274b54a78904ab57

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index b3520215ff8,b05d5ae7d26..1d56648ca35
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1754,18 -1744,24 +1745,36 @@@ void blo_do_versions_290(FileData *fd, 
        }
      }
  
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         version_node_socket_name(ntree, GEO_NODE_ATTRIBUTE_PROXIMITY, "Result", "Distance");
+       }
+     }
+     FOREACH_NODETREE_END;
+   }
+ 
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #blo_do_versions_userdef
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
      /* 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;
 +        }
 +      }
 +    }
    }
  }