[Bf-blender-cvs] [e61ae00e791] cycles-x: Merge branch 'master' into cycles-x

[Brecht Van Lommel]

Commit: e61ae00e7910393d363899a1ab312f469cd07616
Author: Brecht Van Lommel
Date:   Mon Sep 20 13:06:11 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBe61ae00e7910393d363899a1ab312f469cd07616

Merge branch 'master' into cycles-x

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 5bfa46c8954,538634f4c9e..cd292d4ff8c
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -1267,23 -1261,18 +1275,35 @@@ void blo_do_versions_300(FileData *fd, 
     */
    {
      /* Keep this block, even when empty. */
 -
+     for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+         LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+           if (sl->spacetype == SPACE_FILE) {
+             SpaceFile *sfile = (SpaceFile *)sl;
+             if (sfile->asset_params) {
+               sfile->asset_params->base_params.recursion_level = FILE_SELECT_MAX_RECURSIONS;
+             }
+           }
+         }
+       }
+     }
 +
 +    /* TODO: move to specific subversion when merging into master. */
 +    FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
 +      if (ntree->type == NTREE_SHADER) {
 +        LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
 +          do_version_subsurface_methods(node);
 +        }
 +      }
 +    }
 +    FOREACH_NODETREE_END;
 +
 +    enum {
 +      R_EXR_TILE_FILE = (1 << 10),
 +      R_FULL_SAMPLE = (1 << 15),
 +    };
 +    LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
 +      scene->r.scemode &= ~(R_EXR_TILE_FILE | R_FULL_SAMPLE);
 +    }
    }
  }