GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-13 20:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Fix_wireframe_trafo

Browse Source
This commit is contained in:
Filip Sykala 2021-10-04 09:23:13 +02:00
commit f97d6a442b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -2861,6 +2861,8 @@ void GCodeProcessor::process_M109(const GCodeReader::GCodeLine& line)
else else
m_extruder_temps[m_extruder_id] = new_temp; m_extruder_temps[m_extruder_id] = new_temp;
} }
else if (line.has_value('S', new_temp))
m_extruder_temps[m_extruder_id] = new_temp;
} }
void GCodeProcessor::process_M132(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_M132(const GCodeReader::GCodeLine& line)

2
src/slic3r/GUI/MainFrame.cpp
View File

@ -834,7 +834,7 @@ bool MainFrame::can_save() const
#if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED #if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED
return (m_plater != nullptr) && return (m_plater != nullptr) &&
!m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) && !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) &&
!m_plater->get_project_filename().empty() && m_plater->is_project_dirty(); m_plater->is_project_dirty();
#else #else
return (m_plater != nullptr) && !m_plater->model().objects.empty() && return (m_plater != nullptr) && !m_plater->model().objects.empty() &&
!m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) && !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) &&