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

[YimingWu]

Commit: b16db629baff52a05c20e169e7e411df9a8aba5e
Author: YimingWu
Date:   Sun Jun 27 11:39:48 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBb16db629baff52a05c20e169e7e411df9a8aba5e

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

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 58c33b883bf,37ee93b5f0f..a965adacacc
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@@ -961,21 -922,21 +961,21 @@@ void MOD_lineart_chain_split_angle(Line
    while ((ec = BLI_pophead(&swap)) != NULL) {
      ec->next = ec->prev = NULL;
      BLI_addtail(&rb->chains, ec);
 -    LineartEdgeChainItem *first_rlci = (LineartEdgeChainItem *)ec->chain.first;
 -    for (eci = first_rlci->next; eci; eci = next_rlci) {
 -      next_rlci = eci->next;
 -      prev_rlci = eci->prev;
 +    LineartEdgeChainItem *first_eci = (LineartEdgeChainItem *)ec->chain.first;
 +    for (eci = first_eci->next; eci; eci = next_eci) {
 +      next_eci = eci->next;
 +      prev_eci = eci->prev;
        float angle = M_PI;
 -      if (next_rlci && prev_rlci) {
 -        angle = angle_v2v2v2(prev_rlci->pos, eci->pos, next_rlci->pos);
 +      if (next_eci && prev_eci) {
 +        angle = angle_v2v2v2(prev_eci->pos, eci->pos, next_eci->pos);
        }
        else {
-         break; /* No need to split at the last point anyway.*/
+         break; /* No need to split at the last point anyway. */
        }
        if (angle < angle_threshold_rad) {
 -        new_rlc = lineart_chain_create(rb);
 -        new_rlc->chain.first = eci;
 -        new_rlc->chain.last = ec->chain.last;
 +        new_ec = lineart_chain_create(rb);
 +        new_ec->chain.first = eci;
 +        new_ec->chain.last = ec->chain.last;
          ec->chain.last = eci->prev;
          ((LineartEdgeChainItem *)ec->chain.last)->next = 0;
          eci->prev = 0;