[Bf-blender-cvs] [02d1a1bfcc3] lineart-fn-cached: Merge remote-tracking branch 'origin/master' into lineart-fn-cached

[YimingWu]

Commit: 02d1a1bfcc3c06dd2b6ebfc4e1d2ea48187bf221
Author: YimingWu
Date:   Thu May 27 20:22:42 2021 +0800
Branches: lineart-fn-cached
https://developer.blender.org/rB02d1a1bfcc3c06dd2b6ebfc4e1d2ea48187bf221

Merge remote-tracking branch 'origin/master' into lineart-fn-cached

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
index 6ff96bca8fb,4e0585c9f6d..2db6cec2870
--- a/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/MOD_lineart.h
@@@ -522,12 -505,11 +523,12 @@@ void MOD_lineart_chain_connect(LineartR
  void MOD_lineart_chain_discard_short(LineartRenderBuffer *rb, const float threshold);
  void MOD_lineart_chain_split_angle(LineartRenderBuffer *rb, float angle_threshold_rad);
  
- int MOD_lineart_chain_count(const LineartEdgeChain *rlc);
+ int MOD_lineart_chain_count(const LineartEdgeChain *ec);
 -void MOD_lineart_chain_clear_picked_flag(struct LineartRenderBuffer *rb);
 +void MOD_lineart_chain_clear_picked_flag(LineartCache *lc);
  
  bool MOD_lineart_compute_feature_lines(struct Depsgraph *depsgraph,
 -                                       struct LineartGpencilModifierData *lmd);
 +                                       struct LineartGpencilModifierData *lmd,
 +                                       LineartCache **cached_result);
  
  struct Scene;
  
diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
index 619310c0173,c023c63ebc9..75c939d50aa
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
@@@ -112,22 -111,11 +112,22 @@@ static bool bake_strokes
      /* No greasepencil frame created or found. */
      return false;
    }
 -
 -  MOD_lineart_compute_feature_lines(dg, lmd);
 +  LineartCache *local_lc = *lc;
 +  if (!(*lc)) {
 +    MOD_lineart_compute_feature_lines(dg, lmd, lc);
 +    MOD_lineart_destroy_render_data(lmd);
 +  }
 +  else {
 +    if (!(lmd->flags & LRT_GPENCIL_USE_CACHE)) {
-       MOD_lineart_compute_feature_lines(dg, lmd, &local_lc, (!(ob->dtx & OB_DRAW_IN_FRONT)));
++      MOD_lineart_compute_feature_lines(dg, lmd, &local_lc);
 +      MOD_lineart_destroy_render_data(lmd);
 +    }
 +    MOD_lineart_chain_clear_picked_flag(local_lc);
 +    lmd->cache = local_lc;
 +  }
  
    MOD_lineart_gpencil_generate(
 -      lmd->render_buffer,
 +      lmd->cache,
        dg,
        ob,
        gpl,