[Bf-blender-cvs] [f5588dfb703] temp_bmesh_multires: Merge branch 'master' into temp_bmesh_multires

[Joseph Eagar]

Commit: f5588dfb70332d761b09545139ab6f0a815f04a3
Author: Joseph Eagar
Date:   Sat Apr 3 19:29:12 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rBf5588dfb70332d761b09545139ab6f0a815f04a3

Merge branch 'master' into temp_bmesh_multires

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



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

diff --cc .clang-format
index fb0445be9f0,b61ce6018d3..11e6c0dba29
--- a/.clang-format
+++ b/.clang-format
@@@ -263,10 -262,6 +262,7 @@@ ForEachMacros
    - SET_SLOT_PROBING_BEGIN
    - MAP_SLOT_PROBING_BEGIN
    - VECTOR_SET_SLOT_PROBING_BEGIN
 +  - TGSET_ITER
  
- # Use once we bump the minimum version to version 8.
- # # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
- # StatementMacros:
- #   - PyObject_VAR_HEAD
- #   - STRINGIFY
+ StatementMacros:
+   - PyObject_VAR_HEAD
diff --cc source/blender/blenloader/intern/versioning_290.c
index ca9d083f7aa,c9f93d35eb3..4188995cfcb
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1919,27 -1950,18 +1962,34 @@@ void blo_do_versions_290(FileData *fd, 
    }
  
    if (!MAIN_VERSION_ATLEAST(bmain, 293, 14)) {
 +    LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
 +      ToolSettings *ts = scene->toolsettings;
 +      if (ts && ts->sculpt) {
 +        ts->sculpt->detail_range = 0.4f;
 +      }
 +    }
 +
+     if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "diff_fac")) {
+       LISTBASE_FOREACH (Light *, light, &bmain->lights) {
+         light->diff_fac = 1.0f;
+         light->volume_fac = 1.0f;
+       }
+     }
+ 
 -    LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
 -      if (ntree->type == NTREE_GEOMETRY) {
 -        LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
 -          if (node->type == GEO_NODE_ATTRIBUTE_FILL) {
 -            node->custom2 = ATTR_DOMAIN_AUTO;
 +    LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
 +      if (brush->dyntopo.detail_range == 0.0f) {
 +        Brush defbrush = *brush;
 +
 +        BKE_brush_sculpt_reset(&defbrush);
 +        brush->dyntopo = defbrush.dyntopo;
 +      }
 +
 +      LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
 +        if (ntree->type == NTREE_GEOMETRY) {
 +          LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
 +            if (node->type == GEO_NODE_ATTRIBUTE_FILL) {
 +              node->custom2 = ATTR_DOMAIN_AUTO;
 +            }
            }
          }
        }