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

[Sergey Sharybin]

Commit: 7d5e8d2bc1491026d964f8d4c94232ebe49f0d00
Author: Sergey Sharybin
Date:   Fri Aug 27 15:47:59 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB7d5e8d2bc1491026d964f8d4c94232ebe49f0d00

Merge branch 'master' into cycles-x

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 1027fb4b79c,aee6d798799..695872e559e
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -833,22 -808,22 +822,40 @@@ void blo_do_versions_300(FileData *fd, 
        }
      }
  
+     LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+       SequencerToolSettings *sequencer_tool_settings = SEQ_tool_settings_ensure(scene);
+       sequencer_tool_settings->overlap_mode = SEQ_OVERLAP_SHUFFLE;
+     }
+   }
+ 
+   /**
+    * 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. */
++
 +    /* 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);
 +    }
    }
  }