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

[YimingWu]

Commit: 3ccc04a817ce071ea81d0492b1d8e0c9d467c6a0
Author: YimingWu
Date:   Tue Sep 28 14:45:21 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB3ccc04a817ce071ea81d0492b1d8e0c9d467c6a0

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

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
index a5860698cba,c00f34185dd..00c1745bb7f
--- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
@@@ -327,12 -316,9 +327,14 @@@ typedef struct LineartRenderBuffer 
    float crease_threshold;
    float chaining_image_threshold;
    float angle_splitting_threshold;
 +  float chain_smooth_tolerance;
 +
 +  /* Could be direction or position, depends on light_is_sun. */
 +  double light_vector[3];
 +  bool light_is_sun;
  
+   float chain_smooth_tolerance;
+ 
    /* FIXME(Yiming): Temporary solution for speeding up calculation by not including lines that
     * are not in the selected source. This will not be needed after we have a proper scene-wise
     * cache running because multiple modifiers can then select results from that without further