1 files changed, 24 insertions, 0 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
index c576cfbe525..414231fcae5 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c
@@ -122,6 +122,30 @@ static int remapTime(struct GpencilModifierData *md,
       nfra = (efra + 1 - (cfra + offset - 1) % (efra - sfra + 1)) - 1;
     }
   }
+
+  if (mmd->mode == GP_TIME_MODE_PINGPONG) {
+    if ((mmd->flag & GP_TIME_KEEP_LOOP) == 0) {
+      if (((int)(cfra + offset - 1) / (efra - sfra)) % (2)) {
+        nfra = efra - (cfra + offset - 1) % (efra - sfra);
+      }
+      else {
+        nfra = sfra + (cfra + offset - 1) % (efra - sfra);
+      }
+      if (cfra > (efra - sfra) * 2) {
+        nfra = sfra + offset;
+      }
+    }
+    else {
+
+      if (((int)(cfra + offset - 1) / (efra - sfra)) % (2)) {
+        nfra = efra - (cfra + offset - 1) % (efra - sfra);
+      }
+      else {
+        nfra = sfra + (cfra + offset - 1) % (efra - sfra);
+      }
+    }
+  }
+
   return nfra;
 }