diff --git a/src/app/tools/intertwine.cpp b/src/app/tools/intertwine.cpp
index 2c8d1d54d..75a9c6f6e 100644
--- a/src/app/tools/intertwine.cpp
+++ b/src/app/tools/intertwine.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018  Igara Studio S.A.
+// Copyright (C) 2018-2019  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -29,6 +29,7 @@ gfx::Rect Intertwine::getStrokeBounds(ToolLoop* loop, const Stroke& stroke)
   return stroke.bounds();
 }
 
+// static
 void Intertwine::doPointshapePoint(int x, int y, ToolLoop* loop)
 {
   Symmetry* symmetry = loop->getSymmetry();
@@ -52,24 +53,33 @@ void Intertwine::doPointshapePoint(int x, int y, ToolLoop* loop)
   }
 }
 
+// static
 void Intertwine::doPointshapeHline(int x1, int y, int x2, ToolLoop* loop)
 {
   algo_line_perfect(x1, y, x2, y, loop, (AlgoPixel)doPointshapePoint);
 }
 
+// static
 void Intertwine::doPointshapeLine(int x1, int y1, int x2, int y2, ToolLoop* loop)
+{
+  doc::AlgoLineWithAlgoPixel algo = getLineAlgo(loop);
+  algo(x1, y1, x2, y2, (void*)loop, (AlgoPixel)doPointshapePoint);
+}
+
+// static
+doc::AlgoLineWithAlgoPixel Intertwine::getLineAlgo(ToolLoop* loop)
 {
   if (// When "Snap Angle" in being used or...
       (int(loop->getModifiers()) & int(ToolLoopModifiers::kSquareAspect)) ||
       // "Snap to Grid" is enabled
       (loop->getController()->canSnapToGrid() && loop->getSnapToGrid())) {
     // We prefer the perfect pixel lines that matches grid tiles
-    algo_line_perfect(x1, y1, x2, y2, loop, (AlgoPixel)doPointshapePoint);
+    return algo_line_perfect;
   }
   else {
     // In other case we use the regular algorithm that is useful to
     // draw continuous lines/strokes.
-    algo_line_continuous(x1, y1, x2, y2, loop, (AlgoPixel)doPointshapePoint);
+    return algo_line_continuous;
   }
 }
 
diff --git a/src/app/tools/intertwine.h b/src/app/tools/intertwine.h
index 47b34cd7d..42bbe8693 100644
--- a/src/app/tools/intertwine.h
+++ b/src/app/tools/intertwine.h
@@ -1,4 +1,5 @@
 // Aseprite
+// Copyright (C) 2019  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -8,6 +9,7 @@
 #define APP_TOOLS_INTERTWINE_H_INCLUDED
 #pragma once
 
+#include "doc/algo.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 
@@ -37,6 +39,8 @@ namespace app {
       static void doPointshapePoint(int x, int y, ToolLoop* loop);
       static void doPointshapeHline(int x1, int y, int x2, ToolLoop* loop);
       static void doPointshapeLine(int x1, int y1, int x2, int y2, ToolLoop* loop);
+
+      static doc::AlgoLineWithAlgoPixel getLineAlgo(ToolLoop* loop);
     };
 
   } // namespace tools
diff --git a/src/app/tools/intertwiners.h b/src/app/tools/intertwiners.h
index 436682c22..da5297bd2 100644
--- a/src/app/tools/intertwiners.h
+++ b/src/app/tools/intertwiners.h
@@ -102,8 +102,9 @@ public:
         }
       }
       else {
+        doc::AlgoLineWithAlgoPixel lineAlgo = getLineAlgo(loop);
         for (int c=0; c+1<stroke.size(); ++c) {
-          algo_line_continuous(
+          lineAlgo(
             stroke[c].x,
             stroke[c].y,
             stroke[c+1].x,
diff --git a/src/doc/algo.h b/src/doc/algo.h
index 512ad64d2..519e50c80 100644
--- a/src/doc/algo.h
+++ b/src/doc/algo.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (C) 2018  Igara Studio S.A.
+// Copyright (C) 2018-2019  Igara Studio S.A.
 // Copyright (c) 2001-2018 David Capello
 //
 // This file is released under the terms of the MIT license.
@@ -18,6 +18,7 @@ namespace doc {
 
   typedef void (*AlgoPixel)(int x, int y, void *data);
   typedef void (*AlgoLine)(int x1, int y1, int x2, int y2, void *data);
+  typedef void (*AlgoLineWithAlgoPixel)(int x1, int y1, int x2, int y2, void *data, AlgoPixel proc);
 
   // Useful to create lines with more predictable behavior and perfect
   // pixel block of lines where we'll have a number of lines/rows that