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

[YimingWu]

Commit: 087e63539e95a499a1b5acccd1c9e4701d5d6f83
Author: YimingWu
Date:   Thu Sep 23 12:43:54 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB087e63539e95a499a1b5acccd1c9e4701d5d6f83

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

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



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

diff --cc source/blender/makesdna/DNA_gpencil_modifier_defaults.h
index cbe99350ddb,2a3c6f4e3db..f5253162d5f
--- a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
@@@ -297,9 -296,21 +296,21 @@@
      .dist_end = 20.0f, \
    }
  
+ #define _DNA_DEFAULT_WeightAngleGpencilModifierData \
+   { \
+     .target_vgname = "", \
+     .material = NULL, \
+     .layername = "", \
+     .vgname = "", \
+     .pass_index = 0, \
+     .flag = 0, \
+     .axis = 1, \
+     .layer_pass = 0, \
+   }
+ 
  #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, \