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

[Pablo Dobarro]

Commit: c10b19e453540229d8fb9ba39b19463d5622caa5
Author: Pablo Dobarro
Date:   Wed Jan 20 18:56:37 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBc10b19e453540229d8fb9ba39b19463d5622caa5

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index c52ac7ff80a,ff82dab3405..06f954feca1
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1608,5 -1609,18 +1610,24 @@@ void blo_do_versions_290(FileData *fd, 
          brush->gpencil_settings->fill_factor = 1.0f;
        }
      }
++
++    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);
++      }
++    }
+   }
+ 
+   /**
+    * 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. */
    }
  }