[Bf-blender-cvs] [4cdb056036e] lineart-fn-cached: LineArt: Fix cache allocation error.

YimingWu noreply at git.blender.org
Tue Jun 15 14:09:21 CEST 2021


Commit: 4cdb056036ed93886a97037df423a85426714324
Author: YimingWu
Date:   Thu Apr 22 11:05:11 2021 +0800
Branches: lineart-fn-cached
https://developer.blender.org/rB4cdb056036ed93886a97037df423a85426714324

LineArt: Fix cache allocation error.

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

M	source/blender/blenkernel/intern/gpencil_modifier.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index f3f0fd9e62e..257e0781252 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -824,10 +824,10 @@ void BKE_gpencil_modifiers_calc(Depsgraph *depsgraph, Scene *scene, Object *ob)
   /* Clear any lattice data. */
   BKE_gpencil_lattice_clear(ob);
 
-  if (has_lineart) {
-    MOD_lineart_clear_cache(gpd->runtime.lineart_cache);
-    gpd->runtime.lineart_cache = NULL;
-  }
+  // if (has_lineart) {
+  MOD_lineart_clear_cache(gpd->runtime.lineart_cache);
+  gpd->runtime.lineart_cache = NULL;
+  //}
 }
 
 void BKE_gpencil_modifier_blend_write(BlendWriter *writer, ListBase *modbase)
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 0ae4cc23eff..4f49e0fb688 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -2651,7 +2651,7 @@ void MOD_lineart_destroy_render_data(LineartGpencilModifierData *lmd)
 
 static LineartCache *lineart_init_cache()
 {
-  LineartCache *lc = MEM_callocN(sizeof(LineartCache *), "Lineart Cache");
+  LineartCache *lc = MEM_callocN(sizeof(LineartCache), "Lineart Cache");
   return lc;
 }



More information about the Bf-blender-cvs mailing list