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

[Pablo Dobarro]

Commit: 13b7b69e7fe6027da595f31e4292d7289c9aaec5
Author: Pablo Dobarro
Date:   Mon Mar 1 18:01:17 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB13b7b69e7fe6027da595f31e4292d7289c9aaec5

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 1d56648ca35,5e2582a184a..0adbba4b8c7
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1764,17 -1763,12 +1764,24 @@@ 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_ATTRIBUTE_PROXIMITY, "Location", "Position");
+       }
+     }
+     FOREACH_NODETREE_END;
    }
  }