[Bf-blender-cvs] [38dce1d29df] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: 38dce1d29dfeb44466a5ad11595f532db85d3532
Author: Pablo Dobarro
Date:   Sat Jan 9 17:56:44 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB38dce1d29dfeb44466a5ad11595f532db85d3532

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index eface1d24fc,e5e04afc927..184b4d1ca23
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1515,4 -1508,26 +1509,31 @@@ void blo_do_versions_290(FileData *fd, 
        }
      }
    }
+ 
+   LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+     Editing *ed = SEQ_editing_get(scene, false);
+     if (ed == NULL) {
+       continue;
+     }
+     ed->cache_flag = (SEQ_CACHE_STORE_RAW | SEQ_CACHE_STORE_FINAL_OUT);
+     do_versions_strip_cache_settings_recursive(&ed->seqbase);
+   }
+ 
+   /**
+    * 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. */
++    if (!DNA_struct_elem_find(fd->filesdna, "Brush", "CurveMapping", "*pressure_size_curve")) {
++      LISTBASE_FOREACH (Brush *, br, &bmain->brushes) {
++        BKE_brush_default_input_curves_set(br);
++      }
++    }
+   }
  }