[Bf-blender-cvs] [77a28f34d5a] master: LineArt: Fix modifier apply.

YimingWu noreply at git.blender.org
Sat Jul 10 08:04:32 CEST 2021


Commit: 77a28f34d5a7912ddee6839e5d3f736d719bfdac
Author: YimingWu
Date:   Sat Jul 10 14:04:23 2021 +0800
Branches: master
https://developer.blender.org/rB77a28f34d5a7912ddee6839e5d3f736d719bfdac

LineArt: Fix modifier apply.

After cache implementation line art apply will not show strokes properly, now fixed.

# Conflicts:
#	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 9593a1364e7..bcead683220 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -205,11 +205,18 @@ static void bakeModifier(Main *UNUSED(bmain),
   }
 
   if (!gpd->runtime.lineart_cache) {
+    /* Only calculate for this modifer, thus no need to get maximum values from all line art
+     * modifiers in the stack. */
+    lmd->edge_types_override = lmd->edge_types;
+    lmd->level_end_override = lmd->level_end;
+
     MOD_lineart_compute_feature_lines(depsgraph, lmd, &gpd->runtime.lineart_cache);
     MOD_lineart_destroy_render_data(lmd);
   }
 
   generate_strokes_actual(md, depsgraph, ob, gpl, gpf);
+
+  MOD_lineart_clear_cache(&gpd->runtime.lineart_cache);
 }
 
 static bool isDisabled(GpencilModifierData *md, int UNUSED(userRenderParams))



More information about the Bf-blender-cvs mailing list