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

[YimingWu]

Commit: b02b478bb7e24a81bdedc584a8fbb8e68508e501
Author: YimingWu
Date:   Mon Jun 14 14:45:35 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBb02b478bb7e24a81bdedc584a8fbb8e68508e501

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

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 3c6edc4e663,25c4e959ac1..e143239991a
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@@ -199,12 -194,11 +199,12 @@@ void MOD_lineart_chain_feature_lines(Li
  
      ec = lineart_chain_create(rb);
  
 -    /* One chain can only have one object_ref,
 -     * so we assign it based on the first segment we found. */
 +    /* One chain can only have one object_ref and intersection_mask,
 +     * so we assign them based on the first segment we found. */
      ec->object_ref = e->object_ref;
 +    ec->intersection_mask = e->intersection_mask;
  
-     LineartEdge *new_e = e;
+     LineartEdge *new_e;
      LineartVert *new_vt;
      float N[3] = {0};
  
diff --cc source/tools
index f99d29ae3e6,2afbb8ec472..01f51a0e551
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f99d29ae3e6ad44d45d79309454c45f8088781a4
 -Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
++Subproject commit 01f51a0e551ab730f0934dc6488613690ac4bf8f