3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 13:47:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2021-07-23 11:40:07 +02:00
commit 8df2525355
20 changed files with 338 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -254,7 +254,7 @@ void GLCanvas3D::LayersEditing::render_overlay(const GLCanvas3D& canvas) const
float widget_align = ImGui::GetCursorPosX();
ImGui::PushItemWidth(imgui.get_style_scaling() * 120.0f);
m_adaptive_quality = std::clamp(m_adaptive_quality, 0.0f, 1.f);
ImGui::SliderFloat("", &m_adaptive_quality, 0.0f, 1.f, "%.2f");
imgui.slider_float("", &m_adaptive_quality, 0.0f, 1.f, "%.2f");
ImGui::Separator();
if (imgui.button(_L("Smooth")))