From f30a8ac4fb18320f53dacc2662a54603ae486116 Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Wed, 10 Jul 2024 15:49:50 +0200
Subject: [PATCH] Fixed conflicts after merge

---
 src/libslic3r/GCode.cpp                | 2 +-
 src/libslic3r/GCode/ExtrusionOrder.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index a1812fe77f..516c56de77 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -2316,7 +2316,7 @@ struct SmoothPathGenerator {
                 );
             }
 
-            assert(validate_smooth_path(smooth_path, !m_enable_loop_clipping));
+            assert(validate_smooth_path(smooth_path, !enable_loop_clipping));
 
             result = smooth_path;
         } else if (auto multipath = dynamic_cast<const ExtrusionMultiPath *>(extrusion_entity)) {
diff --git a/src/libslic3r/GCode/ExtrusionOrder.cpp b/src/libslic3r/GCode/ExtrusionOrder.cpp
index 45724cced5..b746ea352b 100644
--- a/src/libslic3r/GCode/ExtrusionOrder.cpp
+++ b/src/libslic3r/GCode/ExtrusionOrder.cpp
@@ -1,5 +1,5 @@
 #include "ExtrusionOrder.hpp"
-#include "GCode/SmoothPath.hpp"
+#include "libslic3r/GCode/SmoothPath.hpp"
 #include "libslic3r/ShortestPath.hpp"
 
 namespace Slic3r::GCode::ExtrusionOrder {