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

[YimingWu]

Commit: f08b8826dbb006b863ef60a7baa65682b33e6419
Author: YimingWu
Date:   Fri Jul 2 21:06:37 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBf08b8826dbb006b863ef60a7baa65682b33e6419

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

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



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

diff --cc source/blender/makesdna/DNA_gpencil_modifier_defaults.h
index 284ff59b134,b9697beeea9..4b76a58dd71
--- a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
@@@ -287,9 -283,23 +283,23 @@@
      .colorband = NULL, \
    }
  
+ #define _DNA_DEFAULT_WeightGpencilModifierData \
+   { \
+     .target_vgname = "", \
+     .material = NULL, \
+     .layername = "", \
+     .vgname = "", \
+     .pass_index = 0, \
+     .flag = 0, \
+     .axis = 1, \
+     .layer_pass = 0, \
+     .dist_start = 0.0f, \
+     .dist_end = 20.0f, \
+   }
+ 
  #define _DNA_DEFAULT_LineartGpencilModifierData \
    { \
 -    .edge_types = LRT_EDGE_FLAG_ALL_TYPE, \
 +    .edge_types = LRT_EDGE_FLAG_INIT_TYPE, \
      .thickness = 25, \
      .opacity = 1.0f, \
      .flags = LRT_GPENCIL_MATCH_OUTPUT_VGROUP, \