diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-12-05 16:53:24 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-12-05 16:53:24 +0300 |
| commit | a408b4260c85454e20e8181bfcd1d104b241d632 (patch) | |
| tree | 3e058b92f9fcac2d74648ac864cfaa591834aa6e | |
| parent | 36e1a93da90748a850b29736913998a1cef514d8 (diff) | |
| parent | 16d852df250d3b885a1e077a253c39846ed47df4 (diff) | |
Merge branch 'stable' of https://github.com/Prusa3d/PrusaSlicer into stableversion_2.1.1-rc
| -rw-r--r-- | src/slic3r/GUI/GLToolbar.cpp | 7 | ||||
| -rw-r--r-- | src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index 63387bf2d..7801cede7 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -1207,7 +1207,12 @@ bool GLToolbar::generate_icons_texture() const states.push_back(std::make_pair(1, true)); } - bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, (unsigned int)(m_layout.icons_size * m_layout.scale), true); + unsigned int sprite_size_px = (unsigned int)(m_layout.icons_size * m_layout.scale); +// // force even size +// if (sprite_size_px % 2 != 0) +// sprite_size_px += 1; + + bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, sprite_size_px, false); if (res) m_icons_texture_dirty = false; diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 3bad1b0a3..c7d3e2b4e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -1062,7 +1062,12 @@ bool GLGizmosManager::generate_icons_texture() const states.push_back(std::make_pair(0, false)); states.push_back(std::make_pair(0, true)); - bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, (unsigned int)(m_overlay_icons_size * m_overlay_scale), true); + unsigned int sprite_size_px = (unsigned int)(m_overlay_icons_size * m_overlay_scale); +// // force even size +// if (sprite_size_px % 2 != 0) +// sprite_size_px += 1; + + bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, sprite_size_px, false); if (res) m_icons_texture_dirty = false; |