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

[Brecht Van Lommel]

Commit: 360d2c609009c8d6f2c9faf9ca3a07d729c5766f
Author: Brecht Van Lommel
Date:   Mon Sep 20 18:26:04 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB360d2c609009c8d6f2c9faf9ca3a07d729c5766f

Merge branch 'master' into cycles-x

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index cd292d4ff8c,30e7c9bde4c..0b1e565db1c
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -1288,22 -1264,42 +1278,59 @@@ void blo_do_versions_300(FileData *fd, 
        }
      }
  
+     LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+       LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+         LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+           if (sl->spacetype == SPACE_SEQ) {
+             SpaceSeq *sseq = (SpaceSeq *)sl;
+             int seq_show_safe_margins = (sseq->flag & SEQ_PREVIEW_SHOW_SAFE_MARGINS);
+             int seq_show_gpencil = (sseq->flag & SEQ_PREVIEW_SHOW_GPENCIL);
+             int seq_show_fcurves = (sseq->flag & SEQ_TIMELINE_SHOW_FCURVES);
+             int seq_show_safe_center = (sseq->flag & SEQ_PREVIEW_SHOW_SAFE_CENTER);
+             int seq_show_metadata = (sseq->flag & SEQ_PREVIEW_SHOW_METADATA);
+             int seq_show_strip_name = (sseq->flag & SEQ_TIMELINE_SHOW_STRIP_NAME);
+             int seq_show_strip_source = (sseq->flag & SEQ_TIMELINE_SHOW_STRIP_SOURCE);
+             int seq_show_strip_duration = (sseq->flag & SEQ_TIMELINE_SHOW_STRIP_DURATION);
+             int seq_show_grid = (sseq->flag & SEQ_TIMELINE_SHOW_GRID);
+             int show_strip_offset = (sseq->draw_flag & SEQ_TIMELINE_SHOW_STRIP_OFFSETS);
+             sseq->preview_overlay.flag = (seq_show_safe_margins | seq_show_gpencil |
+                                           seq_show_safe_center | seq_show_metadata);
+             sseq->timeline_overlay.flag = (seq_show_fcurves | seq_show_strip_name |
+                                            seq_show_strip_source | seq_show_strip_duration |
+                                            seq_show_grid | show_strip_offset);
+           }
+         }
+       }
+     }
+   }
+ 
+   /**
+    * 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);
 +    }
    }
  }