GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-31 10:34:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed merge conflicts (whitespace only)

Browse Source
This commit is contained in:
Lukas Matena 2020-09-01 18:33:56 +02:00
parent 46eb96e84f
commit 60cf002e94
2 changed files with 297 additions and 294 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode.cpp
View File

@ -983,6 +983,7 @@ namespace DoExport {
return volumetric_speed; return volumetric_speed;
} }
static void init_ooze_prevention(const Print &print, OozePrevention &ooze_prevention) static void init_ooze_prevention(const Print &print, OozePrevention &ooze_prevention)
{ {
// Calculate wiping points if needed // Calculate wiping points if needed
@ -2861,6 +2862,7 @@ std::string GCode::extrude_loop(ExtrusionLoop loop, std::string description, dou
m_seam_position[m_layer->object()] = polygon.points[idx_min]; m_seam_position[m_layer->object()] = polygon.points[idx_min];
} }
// Export the contour into a SVG file. // Export the contour into a SVG file.
#if 0 #if 0
{ {

1
src/libslic3r/GCode.hpp
View File

@ -69,6 +69,7 @@ private:
std::unique_ptr<MotionPlanner> m_layer_mp; std::unique_ptr<MotionPlanner> m_layer_mp;
}; };
class OozePrevention { class OozePrevention {
public: public:
bool enable; bool enable;