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

[Joseph Eagar]

Commit: 2cf8c35578ca9961e812b5c4d27f01da15211fc9
Author: Joseph Eagar
Date:   Tue Mar 30 00:57:43 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB2cf8c35578ca9961e812b5c4d27f01da15211fc9

Merge branch 'master' into temp_bmesh_multires

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 22b38d73c22,aae5a2ec190..7db92760e58
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1917,19 -1907,32 +1919,46 @@@ 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;
 +      }
 +    }
 +
 +    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;
++    }
++
+     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;
+       }
 -    }
+ 
+     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;
+           }
+         }
+       }
+     }
+   }
+ 
+   if (!MAIN_VERSION_ATLEAST(bmain, 293, 15)) {
+     LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+           if (STREQ(node->idname, "GeometryNodeMeshPlane")) {
+             STRNCPY(node->idname, "GeometryNodeMeshGrid");
+           }
+         }
        }
      }
    }