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

[YimingWu]

Commit: 3507916f62cde0e7f56215ce0c388b4791e806f8
Author: YimingWu
Date:   Sat May 22 14:25:37 2021 +0800
Branches: lineart-bvh
https://developer.blender.org/rB3507916f62cde0e7f56215ce0c388b4791e806f8

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

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



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

diff --cc source/blender/makesdna/DNA_gpencil_modifier_defaults.h
index bf1ea5e98a7,a4ab38f6022..2641185a2d0
--- a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
@@@ -297,8 -297,16 +297,18 @@@
      .calculation_flags = LRT_ALLOW_DUPLI_OBJECTS | LRT_ALLOW_CLIPPING_BOUNDARIES, \
      .angle_splitting_threshold = DEG2RAD(60.0f), \
      .chaining_image_threshold = 0.001f, \
 +    .stroke_offset = 0.05,\
 +    .chain_smooth_tolerance = 0.2f,\
    }
  
+ #define _DNA_DEFAULT_LengthGpencilModifierData \
+   { \
+     .start_fac = 0.1f,\
+     .end_fac = 0.1f,\
+     .overshoot_fac = 0.01f,\
+     .pass_index = 0,\
+     .material = NULL,\
+   }
+ 
+ 
  /* clang-format off */