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

[Pablo Dobarro]

Commit: ebeb1447013f22235be9880f5dfab9a8525819df
Author: Pablo Dobarro
Date:   Tue Mar 23 17:54:08 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBebeb1447013f22235be9880f5dfab9a8525819df

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 51551d0e752,00f4c49fda9..a2be00294f2
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1916,24 -1916,12 +1917,31 @@@ 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;
+       }
+     }
    }
  }