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

Merge branch 'master' into fs_fixSupportPointProjectionOntoMesh

Browse Source
This commit is contained in:
LAPTOP-R2AR8CRT\filip 2021-01-28 09:46:07 +01:00
commit 06906e60d1
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Format/3mf.cpp
View File

@ -2550,6 +2550,7 @@ namespace Slic3r {
std::string custom_supports_data_string = volume->supported_facets.get_triangle_as_string(i); std::string custom_supports_data_string = volume->supported_facets.get_triangle_as_string(i);
if (! custom_supports_data_string.empty()) { if (! custom_supports_data_string.empty()) {
output_buffer += " ";
output_buffer += CUSTOM_SUPPORTS_ATTR; output_buffer += CUSTOM_SUPPORTS_ATTR;
output_buffer += "=\""; output_buffer += "=\"";
output_buffer += custom_supports_data_string; output_buffer += custom_supports_data_string;
@ -2558,6 +2559,7 @@ namespace Slic3r {
std::string custom_seam_data_string = volume->seam_facets.get_triangle_as_string(i); std::string custom_seam_data_string = volume->seam_facets.get_triangle_as_string(i);
if (! custom_seam_data_string.empty()) { if (! custom_seam_data_string.empty()) {
output_buffer += " ";
output_buffer += CUSTOM_SEAM_ATTR; output_buffer += CUSTOM_SEAM_ATTR;
output_buffer += "=\""; output_buffer += "=\"";
output_buffer += custom_seam_data_string; output_buffer += custom_seam_data_string;

2
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -974,6 +974,7 @@ void Preview::load_print_as_sla()
sort_remove_duplicates(zs); sort_remove_duplicates(zs);
m_canvas->reset_clipping_planes_cache(); m_canvas->reset_clipping_planes_cache();
m_canvas->set_use_clipping_planes(true);
n_layers = (unsigned int)zs.size(); n_layers = (unsigned int)zs.size();
if (n_layers == 0) { if (n_layers == 0) {
@ -1007,7 +1008,6 @@ void Preview::on_layers_slider_scroll_changed(wxCommandEvent& event)
else if (tech == ptSLA) { else if (tech == ptSLA) {
m_canvas->set_clipping_plane(0, ClippingPlane(Vec3d::UnitZ(), -m_layers_slider->GetLowerValueD())); m_canvas->set_clipping_plane(0, ClippingPlane(Vec3d::UnitZ(), -m_layers_slider->GetLowerValueD()));
m_canvas->set_clipping_plane(1, ClippingPlane(-Vec3d::UnitZ(), m_layers_slider->GetHigherValueD())); m_canvas->set_clipping_plane(1, ClippingPlane(-Vec3d::UnitZ(), m_layers_slider->GetHigherValueD()));
m_canvas->set_use_clipping_planes(m_layers_slider->GetHigherValue() != 0);
m_canvas->render(); m_canvas->render();
} }
} }