Moved OriginOffset cleanup to TranslateAndApplyShapeContextWithTrimOffset

Author: aborziak-ms

source/LottieToWinComp/Rectangles.cs

@@ -330,8 +330,6 @@ static void ApplyRectangleContentCommon(
                 rectangle.DrawingDirection == DrawingDirection.Reverse,
                 trimOffsetDegrees: trimOffsetDegrees);
 
-            context.LayerContext.OriginOffset = null;
-
             compositionRectangle.SetDescription(context, () => rectangle.Name);
             compositionRectangle.Geometry.SetDescription(context, () => $"{rectangle.Name}.RectangleGeometry");
         }
@@ -427,8 +425,6 @@ static void ApplyRectangleContentCommonXY(
                 rectangle.DrawingDirection == DrawingDirection.Reverse,
                 trimOffsetDegrees: trimOffsetDegrees);
 
-            context.LayerContext.OriginOffset = null;
-
             compositionRectangle.SetDescription(context, () => rectangle.Name);
             compositionRectangle.Geometry.SetDescription(context, () => $"{rectangle.Name}.RectangleGeometry");
         }

source/LottieToWinComp/Shapes.cs

@@ -45,6 +45,11 @@ public static void TranslateAndApplyShapeContextWithTrimOffset(
             Debug.Assert(shape.Geometry is not null, "Precondition");
 
             shape.FillBrush = Brushes.TranslateShapeFill(context, context.Fill, context.Opacity);
+
+            // OriginOffset is used to adjust cordinates of FillBrush for Rectangle shapes.
+            // It is not needed afterwards, so we clean it up to not affect other code.
+            context.LayerContext.OriginOffset = null;
+
             Brushes.TranslateAndApplyStroke(context, context.Stroke, shape, context.Opacity);
 
             TranslateAndApplyTrimPath(