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

[Yiming Wu]

Commit: 04f67fb2dbf38e05d9c4855d2b214d545913c850
Author: Yiming Wu
Date:   Thu Jun 2 21:27:09 2022 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB04f67fb2dbf38e05d9c4855d2b214d545913c850

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

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index b40be609677,da4d02f9ff2..9d5cf608c5a
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@@ -3878,8 -3808,10 +3858,8 @@@ static void lineart_bounding_area_split
    }
  
    /* At this point the child tiles are fully initialized and it's safe for new triangles to be
-    * inserted, so assign root->child for #lineart_bounding_area_link_triangle_cas to use. */
+    * inserted, so assign root->child for #lineart_bounding_area_link_triangle to use. */
    root->child = ba;
 -
 -  rb->bounding_area_count += 3;
  }
  
  static bool lineart_bounding_area_edge_intersect(LineartRenderBuffer *UNUSED(fb),