[Bf-blender-cvs] [779b8f13d29] temp-gpencil-bezier-stroke-type: Merge branch 'master' into temp-gpencil-bezier-stroke-type
Antonio Vazquez
noreply at git.blender.org
Wed Mar 24 16:55:25 CET 2021
Commit: 779b8f13d295f9824766800edff880f47ffe7098
Author: Antonio Vazquez
Date: Wed Mar 24 16:55:19 2021 +0100
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rB779b8f13d295f9824766800edff880f47ffe7098
Merge branch 'master' into temp-gpencil-bezier-stroke-type
===================================================================
===================================================================
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
index a94796a314f,2934b89c747..85908152f7a
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
@@@ -148,12 -148,15 +148,15 @@@ static void bakeModifier(Main *UNUSED(b
CFRA = gpf->framenum;
BKE_scene_graph_update_for_newframe(depsgraph);
- /* recalculate lattice data */
- BKE_gpencil_lattice_init(ob);
+ /* Recalculate lattice data. */
+ if (mmd->cache_data) {
+ BKE_lattice_deform_data_destroy(mmd->cache_data);
+ }
+ mmd->cache_data = BKE_lattice_deform_data_create(mmd->object, ob);
- /* compute lattice effects on this frame */
+ /* Compute lattice effects on this frame. */
LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
- deformStroke(md, depsgraph, ob, gpl, gpf, gps);
+ deformPolyline(md, depsgraph, ob, gpl, gpf, gps);
}
}
}
More information about the Bf-blender-cvs
mailing list