GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-30 06:52:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed conflicts after merge

Browse Source
This commit is contained in:
Lukas Matena 2024-07-10 15:49:50 +02:00
parent fb47a62fd7
commit f30a8ac4fb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View File

@ -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; result = smooth_path;
} else if (auto multipath = dynamic_cast<const ExtrusionMultiPath *>(extrusion_entity)) { } else if (auto multipath = dynamic_cast<const ExtrusionMultiPath *>(extrusion_entity)) {

2
src/libslic3r/GCode/ExtrusionOrder.cpp
View File

@ -1,5 +1,5 @@
#include "ExtrusionOrder.hpp" #include "ExtrusionOrder.hpp"
#include "GCode/SmoothPath.hpp" #include "libslic3r/GCode/SmoothPath.hpp"
#include "libslic3r/ShortestPath.hpp" #include "libslic3r/ShortestPath.hpp"
namespace Slic3r::GCode::ExtrusionOrder { namespace Slic3r::GCode::ExtrusionOrder {