GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-26 09:54:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of SPE-1041: set_state function for gizmos is called even if they are turned on/off by the undo/redo action

Browse Source
This commit is contained in:
Lukas Matena 2019-10-25 13:09:10 +02:00
parent 0986221fdc
commit 62c90abbc0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,8 +114,17 @@ public:
m_serializing = true; 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); 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) if (m_current != Undefined)
m_gizmos[m_current]->load(ar); m_gizmos[m_current]->load(ar);
} }