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

[Pablo Dobarro]

Commit: 20f4fe138e33e1709cc68e3f297c0c60bdbfb6df
Author: Pablo Dobarro
Date:   Wed Mar 24 20:55:05 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB20f4fe138e33e1709cc68e3f297c0c60bdbfb6df

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index a2be00294f2,31e4b659c2f..b2461710cea
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -52,7 -52,7 +52,8 @@@
  
  #include "BKE_animsys.h"
  #include "BKE_armature.h"
 +#include "BKE_brush.h"
+ #include "BKE_attribute.h"
  #include "BKE_collection.h"
  #include "BKE_colortools.h"
  #include "BKE_cryptomatte.h"
@@@ -1917,31 -1936,5 +1937,17 @@@ 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;
- 
-     if (!DNA_struct_elem_find(fd->filesdna, "Light", "float", "diff_fac")) {
-       LISTBASE_FOREACH (Light *, light, &bmain->lights) {
-         light->diff_fac = 1.0f;
-         light->volume_fac = 1.0f;
-       }
-     }
    }
  }