[Bf-blender-cvs] [131550dac18] spreadsheet-active-node: Merge branch 'master' into spreadsheet-active-node

[Jacques Lucke]

Commit: 131550dac1833520dc85b92ef977a9170b7d8298
Author: Jacques Lucke
Date:   Thu Apr 1 12:45:55 2021 +0200
Branches: spreadsheet-active-node
https://developer.blender.org/rB131550dac1833520dc85b92ef977a9170b7d8298

Merge branch 'master' into spreadsheet-active-node

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index efa865545b6,0c6817542d1..4997639de5e
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1964,17 -1964,11 +1964,24 @@@ void blo_do_versions_290(FileData *fd, 
        }
      }
  
+     /* 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);
 +            }
 +          }
 +        }
 +      }
 +    }
    }
  }