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

[YimingWu]

Commit: 8dcaf4c7982a29c2c446de7c899c0e65abef0965
Author: YimingWu
Date:   Thu Jul 29 20:09:53 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB8dcaf4c7982a29c2c446de7c899c0e65abef0965

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

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



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

diff --cc source/blender/makesdna/DNA_gpencil_modifier_types.h
index 0b4834d8c7a,c91afa58cb1..9033b1a1282
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@@ -944,9 -942,11 +944,10 @@@ struct LineartCache
  typedef struct LineartGpencilModifierData {
    GpencilModifierData modifier;
  
 -  /** Line type enable flags, bits in #eLineartEdgeFlag. */
 -  short edge_types;
 +  uint16_t edge_types; /* line type enable flags, bits in eLineartEdgeFlag */
  
-   char source_type; /* Object or Collection, from eLineartGpencilModifierSource */
+   /** Object or Collection, from #eLineartGpencilModifierSource. */
+   char source_type;
  
    char use_multiple_levels;
    short level_start;
@@@ -989,21 -988,15 +990,21 @@@
    /** `0..PI` angle, for splitting strokes at sharp points. */
    float angle_splitting_threshold;
  
 -  /* Doubles as geometry threshold when geometry space chaining is enabled */
 +  /** Strength for smoothing jagged chains */
 +  float chain_smooth_tolerance;
 +
 +  /* CPU mode */
    float chaining_image_threshold;
  
 -  /* Ported from SceneLineArt flags. */
 +  /* eLineartMainFlags, for one time calculation. */
    int calculation_flags;
  
-   /* eLineArtGPencilModifierFlags, modifier internal state. */
+   /* #eLineArtGPencilModifierFlags, modifier internal state. */
    int flags;
  
 +  /* Move strokes towards camera to avoid clipping while preserve depth for the viewport. */
 +  float stroke_offset;
 +
    /* Runtime data. */
  
    /* Because we can potentially only compute features lines once per modifier stack (Use Cache), we