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

Merge branch 'master' into fs_svg_SPE-1517

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-09-05 14:36:20 +02:00
commit 9e60e733a2
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Config.cpp
View File

@ -423,7 +423,7 @@ std::ostream& ConfigDef::print_cli_help(std::ostream& out, bool show_defaults, s
descr += " ("; descr += " (";
if (!def.sidetext.empty()) { if (!def.sidetext.empty()) {
descr += def.sidetext + ", "; descr += def.sidetext + ", ";
} else if (def.enum_def->has_values()) { } else if (def.enum_def && def.enum_def->has_values()) {
descr += boost::algorithm::join(def.enum_def->values(), ", ") + "; "; descr += boost::algorithm::join(def.enum_def->values(), ", ") + "; ";
} }
descr += "default: " + def.default_value->serialize() + ")"; descr += "default: " + def.default_value->serialize() + ")";

1
src/libslic3r/CutUtils.cpp
View File

@ -11,6 +11,7 @@
#include "TriangleSelector.hpp" #include "TriangleSelector.hpp"
#include "ObjectID.hpp" #include "ObjectID.hpp"
#include <boost/log/trivial.hpp>
namespace Slic3r { namespace Slic3r {

3
src/libslic3r/Measure.cpp
View File

@ -8,9 +8,10 @@
#include "libslic3r/Geometry/Circle.hpp" #include "libslic3r/Geometry/Circle.hpp"
#include "libslic3r/SurfaceMesh.hpp" #include "libslic3r/SurfaceMesh.hpp"
#include <numeric>
#include <numeric> #include <numeric>
#include <tbb/parallel_for.h>
#define DEBUG_EXTRACT_ALL_FEATURES_AT_ONCE 0 #define DEBUG_EXTRACT_ALL_FEATURES_AT_ONCE 0

4
src/libslic3r/MeshBoolean.cpp
View File

@ -152,12 +152,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh)
const auto &vertices = cgalmesh.vertices(); const auto &vertices = cgalmesh.vertices();
int vsize = int(vertices.size()); int vsize = int(vertices.size());
for (auto &vi : vertices) { for (const auto &vi : vertices) {
auto &v = cgalmesh.point(vi); // Don't ask... auto &v = cgalmesh.point(vi); // Don't ask...
its.vertices.emplace_back(to_vec3f(v)); its.vertices.emplace_back(to_vec3f(v));
} }
for (auto &face : faces) { for (const auto &face : faces) {
auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face)); auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face));
int i = 0; int i = 0;

3
src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
View File

@ -141,7 +141,8 @@ void GLGizmoSlaSupports::on_render()
m_selection_rectangle.render(m_parent); m_selection_rectangle.render(m_parent);
m_c->object_clipper()->render_cut(); m_c->object_clipper()->render_cut();
m_c->supports_clipper()->render_cut(); if (are_sla_supports_shown())
m_c->supports_clipper()->render_cut();
glsafe(::glDisable(GL_BLEND)); glsafe(::glDisable(GL_BLEND));
} }

1
src/slic3r/GUI/TextLines.cpp
View File

@ -10,6 +10,7 @@
#include "libslic3r/AABBTreeLines.hpp" #include "libslic3r/AABBTreeLines.hpp"
#include "libslic3r/ExPolygonsIndex.hpp" #include "libslic3r/ExPolygonsIndex.hpp"
#include "libslic3r/ClipperUtils.hpp"
#include "slic3r/GUI/Selection.hpp" #include "slic3r/GUI/Selection.hpp"
#include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GLCanvas3D.hpp"