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

Merge remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend

Browse source 
# Conflicts:
#	src/libslic3r/SLAPrint.hpp
This commit is contained in:
tamasmeszaros 2018-11-13 17:50:17 +01:00
commit 9a93b1d3e9
19 changed files with 441 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View file

@ -294,6 +294,12 @@ void BackgroundSlicingProcess::stop_internal()
m_print->set_cancel_callback([](){});
}
bool BackgroundSlicingProcess::empty() const
{
assert(m_print != nullptr);
return m_print->empty();
}
std::string BackgroundSlicingProcess::validate()
{
assert(m_print != nullptr);