From d3ab965f0fff2d8cab0c967b79a2a912d1e7dd84 Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <guzba8@gmail.com>
Date: Mon, 8 Feb 2021 12:50:24 -0600
Subject: [PATCH] blend mode after winding rule

---
 src/pixie/paths.nim | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/pixie/paths.nim b/src/pixie/paths.nim
index 61650ec..4cef0f3 100644
--- a/src/pixie/paths.nim
+++ b/src/pixie/paths.nim
@@ -889,8 +889,8 @@ proc fillShapes(
   image: Image,
   shapes: seq[seq[Vec2]],
   color: ColorRGBA,
-  blendMode: BlendMode,
-  windingRule: WindingRule
+  windingRule: WindingRule,
+  blendMode: BlendMode
 ) =
   let (topHalf, bottomHalf, fullHeight) =
     partitionSegments(shapes, image.height div 2)
@@ -1165,38 +1165,38 @@ proc fillPath*(
   image: Image,
   path: SomePath,
   color: ColorRGBA,
-  blendMode = bmNormal,
-  windingRule = wrNonZero
+  windingRule = wrNonZero,
+  blendMode = bmNormal
 ) {.inline.} =
-  image.fillShapes(parseSomePath(path), color, blendMode, windingRule)
+  image.fillShapes(parseSomePath(path), color, windingRule, blendMode)
 
 proc fillPath*(
   image: Image,
   path: SomePath,
   color: ColorRGBA,
   pos: Vec2,
-  blendMode = bmNormal,
-  windingRule = wrNonZero
+  windingRule = wrNonZero,
+  blendMode = bmNormal
 ) =
   var shapes = parseSomePath(path)
   for shape in shapes.mitems:
     for segment in shape.mitems:
       segment += pos
-  image.fillShapes(shapes, color, blendMode, windingRule)
+  image.fillShapes(shapes, color, windingRule, blendMode)
 
 proc fillPath*(
   image: Image,
   path: SomePath,
   color: ColorRGBA,
   mat: Mat3,
-  blendMode = bmNormal,
-  windingRule = wrNonZero
+  windingRule = wrNonZero,
+  blendMode = bmNormal
 ) =
   var shapes = parseSomePath(path)
   for shape in shapes.mitems:
     for segment in shape.mitems:
       segment = mat * segment
-  image.fillShapes(shapes, color, blendMode, windingRule)
+  image.fillShapes(shapes, color, windingRule, blendMode)
 
 proc fillPath*(
   mask: Mask,
@@ -1234,15 +1234,15 @@ proc strokePath*(
   path: SomePath,
   color: ColorRGBA,
   strokeWidth = 1.0,
-  blendMode = bmNormal,
-  windingRule = wrNonZero
+  windingRule = wrNonZero,
+  blendMode = bmNormal
 ) =
   let strokeShapes = strokeShapes(
     parseSomePath(path),
     strokeWidth,
     windingRule
   )
-  image.fillShapes(strokeShapes, color, blendMode, windingRule)
+  image.fillShapes(strokeShapes, color, windingRule, blendMode)
 
 proc strokePath*(
   image: Image,
@@ -1250,8 +1250,8 @@ proc strokePath*(
   color: ColorRGBA,
   strokeWidth = 1.0,
   pos: Vec2,
-  blendMode = bmNormal,
-  windingRule = wrNonZero
+  windingRule = wrNonZero,
+  blendMode = bmNormal
 ) =
   var strokeShapes = strokeShapes(
     parseSomePath(path),
@@ -1261,7 +1261,7 @@ proc strokePath*(
   for shape in strokeShapes.mitems:
     for segment in shape.mitems:
       segment += pos
-  image.fillShapes(strokeShapes, color, blendMode, windingRule)
+  image.fillShapes(strokeShapes, color, windingRule, blendMode)
 
 proc strokePath*(
   image: Image,
@@ -1269,8 +1269,8 @@ proc strokePath*(
   color: ColorRGBA,
   strokeWidth = 1.0,
   mat: Mat3,
-  blendMode = bmNormal,
-  windingRule = wrNonZero
+  windingRule = wrNonZero,
+  blendMode = bmNormal
 ) =
   var strokeShapes = strokeShapes(
     parseSomePath(path),
@@ -1280,7 +1280,7 @@ proc strokePath*(
   for shape in strokeShapes.mitems:
     for segment in shape.mitems:
       segment = mat * segment
-  image.fillShapes(strokeShapes, color, blendMode, windingRule)
+  image.fillShapes(strokeShapes, color, windingRule, blendMode)
 
 proc strokePath*(
   mask: Mask,