[Bf-blender-cvs] [bec129af27c] soc-2021-vse-strip-thumbnails: Merge branch 'master' into soc-2021-vse-strip-thumbnails

[Aditya Y Jeppu]

Commit: bec129af27ca8e205cd865f423b2260f00513359
Author: Aditya Y Jeppu
Date:   Sun Aug 22 20:49:41 2021 +0530
Branches: soc-2021-vse-strip-thumbnails
https://developer.blender.org/rBbec129af27ca8e205cd865f423b2260f00513359

Merge branch 'master' into soc-2021-vse-strip-thumbnails

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



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

diff --cc source/blender/sequencer/intern/image_cache.c
index c3112a9933f,86bd840ce31..6190abde195
--- a/source/blender/sequencer/intern/image_cache.c
+++ b/source/blender/sequencer/intern/image_cache.c
@@@ -102,9 -102,8 +102,9 @@@
  /* <cache type>-<resolution X>x<resolution Y>-<rendersize>%(<view_id>)-<frame no>.dcf */
  #define DCACHE_FNAME_FORMAT "%d-%dx%d-%d%%(%d)-%d.dcf"
  #define DCACHE_IMAGES_PER_FILE 100
- #define DCACHE_CURRENT_VERSION 1
+ #define DCACHE_CURRENT_VERSION 2
  #define COLORSPACE_NAME_MAX 64 /* XXX: defined in imb intern */
 +#define THUMB_CACHE_LIMIT 5000
  
  typedef struct DiskCacheHeaderEntry {
    unsigned char encoding;