[Bf-blender-cvs] [d78754ff189] ui-asset-view-template: Merge branch 'master' into ui-asset-view-template

[Julian Eisel]

Commit: d78754ff1892071f792b486ffbe1d17d66c2e20d
Author: Julian Eisel
Date:   Thu Mar 18 15:30:35 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rBd78754ff1892071f792b486ffbe1d17d66c2e20d

Merge branch 'master' into ui-asset-view-template

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 5f6fe262a8c,bf70a50631f..bc01d328370
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1872,12 -1892,28 +1893,37 @@@ void blo_do_versions_290(FileData *fd, 
      }
    }
  
+   if (!MAIN_VERSION_ATLEAST(bmain, 293, 13)) {
+     LISTBASE_FOREACH (bNodeTree *, ntree, &bmain->nodetrees) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+           if (STREQ(node->idname, "GeometryNodeSubdivideSmooth")) {
+             STRNCPY(node->idname, "GeometryNodeSubdivisionSurface");
+           }
+         }
+       }
+     }
+   }
+ 
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #blo_do_versions_userdef
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
+   }
++
 +  {
 +    if (!DNA_struct_elem_find(
 +            fd->filesdna, "WorkSpace", "AssetLibraryReference", "active_asset_library")) {
 +      LISTBASE_FOREACH (WorkSpace *, workspace, &bmain->workspaces) {
 +        BKE_asset_library_reference_init_default(&workspace->active_asset_library);
 +      }
 +    }
 +  }
  }