3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-26 02:01:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail

Browse source
This commit is contained in:
Enrico Turri 2019-10-25 13:59:27 +02:00
commit bab4f51bc8
25 changed files with 3147 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libslic3r/CMakeLists.txt
View file

@ -224,6 +224,7 @@ target_link_libraries(libslic3r
qhull
semver
TBB::tbb
# OpenVDB::openvdb
${CMAKE_DL_LIBS}
)

9
src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
View file

@ -114,8 +114,17 @@ public:
m_serializing = true;
// Following is needed to know which to be turn on, but not actually modify
// m_current prematurely, so activate_gizmo is not confused.
EType old_current = m_current;
ar(m_current);
EType new_current = m_current;
m_current = old_current;
// activate_gizmo call sets m_current and calls set_state for the gizmo
// it does nothing in case the gizmo is already activated
// it can safely be called for Undefined gizmo
activate_gizmo(new_current);
if (m_current != Undefined)
m_gizmos[m_current]->load(ar);
}