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

[Pablo Dobarro]

Commit: 65cea9523ee9716b4cf4643c169234b9737d69cc
Author: Pablo Dobarro
Date:   Mon Jan 18 22:26:46 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB65cea9523ee9716b4cf4643c169234b9737d69cc

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 95a779e1071,33aa472a5e5..c52ac7ff80a
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1583,10 -1583,24 +1584,29 @@@ void blo_do_versions_290(FileData *fd, 
     */
    {
      /* 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);
 +      }
 +    }
+ 
+     /* Grease pencil layer transform matrix. */
+     if (!DNA_struct_elem_find(fd->filesdna, "bGPDlayer", "float", "location[0]")) {
+       LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
+         LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
+           zero_v3(gpl->location);
+           zero_v3(gpl->rotation);
+           copy_v3_fl(gpl->scale, 1.0f);
+           loc_eul_size_to_mat4(gpl->layer_mat, gpl->location, gpl->rotation, gpl->scale);
+           invert_m4_m4(gpl->layer_invmat, gpl->layer_mat);
+         }
+       }
+     }
+     /* Fix Fill factor for grease pencil fill brushes. */
+     LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+       if ((brush->gpencil_settings) && (brush->gpencil_settings->fill_factor == 0.0f)) {
+         brush->gpencil_settings->fill_factor = 1.0f;
+       }
+     }
    }
  }