[Bf-blender-cvs] [e7da22ed8a8] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: e7da22ed8a8b046ba48923f2f8e7c63de44dbb82
Author: YimingWu
Date:   Thu May 6 09:53:42 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBe7da22ed8a8b046ba48923f2f8e7c63de44dbb82

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 35ff57ad781,182231b5878..8d916b48472
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -23,10 -23,12 +23,13 @@@
  #include "BLI_listbase.h"
  #include "BLI_utildefines.h"
  
+ #include "DNA_brush_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_modifier_types.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,18 -75,25 +76,39 @@@ void blo_do_versions_300(FileData *fd, 
          }
        }
      }
++    /* Line art: Default values for new options. */
 +    if (!DNA_struct_elem_find(
 +            fd->filesdna, "LineartGpencilModifierData", "bool", "use_cached_result")) {
 +      LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
 +        if (ob->type == OB_GPENCIL) {
 +          LISTBASE_FOREACH (GpencilModifierData *, md, &ob->greasepencil_modifiers) {
 +            if (md->type == eGpencilModifierType_Lineart) {
 +              LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)md;
 +              lmd->flags |= LRT_GPENCIL_USE_CACHE;
 +            }
 +          }
 +        }
 +      }
 +    }
+     /* 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. */
    }
  }