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

[Julian Eisel]

Commit: 3ce680f43433a1116eef695e2a8fbacb9053f193
Author: Julian Eisel
Date:   Mon Mar 1 17:11:21 2021 +0100
Branches: ui-asset-view-template
https://developer.blender.org/rB3ce680f43433a1116eef695e2a8fbacb9053f193

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

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index fedc003e4ff,5e2582a184a..48e1e8039de
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1753,23 -1744,31 +1744,48 @@@ void blo_do_versions_290(FileData *fd, 
        }
      }
  
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         version_node_socket_name(ntree, GEO_NODE_ATTRIBUTE_PROXIMITY, "Result", "Distance");
+       }
+     }
+     FOREACH_NODETREE_END;
+   }
+ 
+   /**
+    * 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. */
+ 
+     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, "View3D", "AssetLibraryReference", "active_asset_library")) {
 +      LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
 +        LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
 +          LISTBASE_FOREACH (SpaceLink *, space, &area->spacedata) {
 +            if (space->spacetype == SPACE_VIEW3D) {
 +              View3D *v3d = (View3D *)space;
 +              v3d->active_asset_library.type = ASSET_LIBRARY_LOCAL;
 +              v3d->active_asset_library.custom_library_index = -1;
 +            }
 +          }
 +        }
 +      }
 +    }
 +  }
  }