Merge branch 'master_250' (NO CONFLICTS FIXED):
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250. Version master_250 of t/perimeters.t left in tree. CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp CONFLICT (content): Merge conflict in version.inc CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250. Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
This commit is contained in:
commit
b61714bb3e
152 changed files with 86092 additions and 45493 deletions
src/slic3r/GUI
|
@ -877,10 +877,10 @@ void SpinCtrl::BUILD() {
|
|||
|
||||
void SpinCtrl::propagate_value()
|
||||
{
|
||||
if (suppress_propagation)
|
||||
// check if value was really changed
|
||||
if (boost::any_cast<int>(m_value) == tmp_value)
|
||||
return;
|
||||
|
||||
suppress_propagation = true;
|
||||
if (tmp_value == UNDEF_VALUE) {
|
||||
on_kill_focus();
|
||||
} else {
|
||||
|
@ -894,7 +894,6 @@ void SpinCtrl::propagate_value()
|
|||
#endif
|
||||
on_change_field();
|
||||
}
|
||||
suppress_propagation = false;
|
||||
}
|
||||
|
||||
void SpinCtrl::msw_rescale()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue