From 80114b24fa6571087a979906f8a8a83337bf8182 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 11 Aug 2023 14:50:05 +0200
Subject: [PATCH] TVPaint: Fix 'repeat' behavior (#5412)

* adde frame start to repreat frame matching

* removed "loop" from behaviors
---
 openpype/hosts/tvpaint/api/lib.py |  4 ++--
 openpype/hosts/tvpaint/lib.py     | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/tvpaint/api/lib.py b/openpype/hosts/tvpaint/api/lib.py
index 49846d7f29..f8b8c29cdb 100644
--- a/openpype/hosts/tvpaint/api/lib.py
+++ b/openpype/hosts/tvpaint/api/lib.py
@@ -233,7 +233,7 @@ def get_layers_pre_post_behavior(layer_ids, communicator=None):
 
     Pre and Post behaviors is enumerator of possible values:
     - "none"
-    - "repeat" / "loop"
+    - "repeat"
     - "pingpong"
     - "hold"
 
@@ -242,7 +242,7 @@ def get_layers_pre_post_behavior(layer_ids, communicator=None):
     {
         0: {
             "pre": "none",
-            "post": "loop"
+            "post": "repeat"
         }
     }
     ```
diff --git a/openpype/hosts/tvpaint/lib.py b/openpype/hosts/tvpaint/lib.py
index 95653b6ecb..97cf8d3633 100644
--- a/openpype/hosts/tvpaint/lib.py
+++ b/openpype/hosts/tvpaint/lib.py
@@ -77,13 +77,15 @@ def _calculate_pre_behavior_copy(
         for frame_idx in range(range_start, layer_frame_start):
             output_idx_by_frame_idx[frame_idx] = first_exposure_frame
 
-    elif pre_beh in ("loop", "repeat"):
+    elif pre_beh == "repeat":
         # Loop backwards from last frame of layer
         for frame_idx in reversed(range(range_start, layer_frame_start)):
             eq_frame_idx_offset = (
                 (layer_frame_end - frame_idx) % frame_count
             )
-            eq_frame_idx = layer_frame_end - eq_frame_idx_offset
+            eq_frame_idx = layer_frame_start + (
+                layer_frame_end - eq_frame_idx_offset
+            )
             output_idx_by_frame_idx[frame_idx] = eq_frame_idx
 
     elif pre_beh == "pingpong":
@@ -139,10 +141,10 @@ def _calculate_post_behavior_copy(
         for frame_idx in range(layer_frame_end + 1, range_end + 1):
             output_idx_by_frame_idx[frame_idx] = last_exposure_frame
 
-    elif post_beh in ("loop", "repeat"):
+    elif post_beh == "repeat":
         # Loop backwards from last frame of layer
         for frame_idx in range(layer_frame_end + 1, range_end + 1):
-            eq_frame_idx = frame_idx % frame_count
+            eq_frame_idx = layer_frame_start + (frame_idx % frame_count)
             output_idx_by_frame_idx[frame_idx] = eq_frame_idx
 
     elif post_beh == "pingpong":