[Bf-blender-cvs] [c4ed124d676] greasepencil-object: GPencil: Fix time modifier

[Antonio Vazquez]

Commit: c4ed124d6760590de050146d53722515b3eaed13
Author: Antonio Vazquez
Date:   Tue Feb 25 12:50:18 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBc4ed124d6760590de050146d53722515b3eaed13

GPencil: Fix time modifier

After the change of the loop, the time modifier was not evaluated.

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

M	source/blender/blenkernel/intern/gpencil_modifier.c

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

diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 878f1933e8f..1864b886fd3 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -874,6 +874,8 @@ void BKE_gpencil_modifiers_calc(Depsgraph *depsgraph, Scene *scene, Object *ob)
   /* Init general modifiers data. */
   BKE_gpencil_lattice_init(ob);
 
+  const bool time_remap = BKE_gpencil_has_time_modifiers(ob);
+
   LISTBASE_FOREACH (GpencilModifierData *, md, &ob->greasepencil_modifiers) {
 
     if (GPENCIL_MODIFIER_ACTIVE(md, is_render)) {
@@ -888,16 +890,18 @@ void BKE_gpencil_modifiers_calc(Depsgraph *depsgraph, Scene *scene, Object *ob)
         mti->generateStrokes(md, depsgraph, ob);
       }
 
-      /* Apply deform modifiers (only change geometry). */
-      if (mti && mti->deformStroke) {
+      /* Apply deform modifiers and Time remap (only change geometry). */
+      if ((time_remap) || (mti && mti->deformStroke)) {
         LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
           bGPDframe *gpf = BKE_gpencil_frame_retime_get(depsgraph, scene, ob, gpl);
           if (gpf == NULL) {
             continue;
           }
 
-          LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
-            mti->deformStroke(md, depsgraph, ob, gpl, gpf, gps);
+          if (mti->deformStroke) {
+            LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
+              mti->deformStroke(md, depsgraph, ob, gpl, gpf, gps);
+            }
           }
         }
       }