[Bf-blender-cvs] [e05ef9e6074] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: e05ef9e607472348a97d2bee5da22ef3013d0439
Author: Antonio Vazquez
Date:   Tue May 4 15:56:08 2021 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe05ef9e607472348a97d2bee5da22ef3013d0439

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index b2bb70278e1,ee38ad707a4..182231b5878
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -23,10 -23,11 +23,12 @@@
  #include "BLI_listbase.h"
  #include "BLI_utildefines.h"
  
 +#include "DNA_brush_types.h"
  #include "DNA_genfile.h"
  #include "DNA_modifier_types.h"
+ #include "DNA_text_types.h"
  
+ #include "BKE_lib_id.h"
  #include "BKE_main.h"
  
  #include "BLO_readfile.h"
@@@ -77,13 -74,17 +75,25 @@@ void blo_do_versions_300(FileData *fd, 
          }
        }
      }
 +    /* Grease Pencil: Set default value for dilate pixels. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings", "int", "dilate_pixels")) {
 +      LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
 +        if (brush->gpencil_settings) {
 +          brush->gpencil_settings->dilate_pixels = 1;
 +        }
 +      }
 +    }
    }
+   /**
+    * 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. */
+   }
  }