[Bf-blender-cvs] [2e0d2c2e11a] asset-browser-poselib: Merge branch 'master' into asset-browser-poselib

[Julian Eisel]

Commit: 2e0d2c2e11adbd20953f892a2b25a856b3698c2b
Author: Julian Eisel
Date:   Fri Apr 2 14:50:04 2021 +0200
Branches: asset-browser-poselib
https://developer.blender.org/rB2e0d2c2e11adbd20953f892a2b25a856b3698c2b

Merge branch 'master' into asset-browser-poselib

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 0cd18d27587,0d59845e934..c76054f8b59
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1964,14 -1964,45 +1965,54 @@@ void blo_do_versions_290(FileData *fd, 
          arm->axes_position = 1.0;
        }
      }
+ 
+     /* Initialize the spread parameter for area lights*/
+     if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "area_spread")) {
+       LISTBASE_FOREACH (Light *, la, &bmain->lights) {
+         la->area_spread = DEG2RADF(180.0f);
+       }
+     }
+ 
+     LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+         LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+           if (sl->spacetype == SPACE_NODE) {
+             SpaceNode *snode = (SpaceNode *)sl;
+             LISTBASE_FOREACH (bNodeTreePath *, path, &snode->treepath) {
+               STRNCPY(path->display_name, path->node_name);
+             }
+           }
+         }
+       }
+     }
+ 
+     /* The CU_2D flag has been removed. */
+     LISTBASE_FOREACH (Curve *, cu, &bmain->curves) {
+ #define CU_2D (1 << 3)
+       ListBase *nurbs = BKE_curve_nurbs_get(cu);
+       bool is_2d = true;
+ 
+       LISTBASE_FOREACH (Nurb *, nu, nurbs) {
+         if (nu->flag & CU_2D) {
+           nu->flag &= ~CU_2D;
+         }
+         else {
+           is_2d = false;
+         }
+       }
+ #undef CU_2D
+       if (!is_2d && CU_IS_2D(cu)) {
+         cu->flag |= CU_3D;
+       }
+     }
    }
 +
 +  {
 +    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);
 +      }
 +    }
 +  }
  }