3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse source
This commit is contained in:
Enrico Turri 2018-12-18 09:19:18 +01:00
commit 9b93a81b9d
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -385,17 +385,13 @@ void Preview::set_number_extruders(unsigned int number_extruders)
if (m_number_extruders != number_extruders) if (m_number_extruders != number_extruders)
{ {
m_number_extruders = number_extruders; m_number_extruders = number_extruders;
int type = 0; // color by a feature type int tool_idx = m_choice_view_type->FindString(_(L("Tool")));
if (number_extruders > 1) int type = (number_extruders > 1) ? tool_idx /* color by a tool number */ : 0; // color by a feature type
{ m_choice_view_type->SetSelection(type);
int tool_idx = m_choice_view_type->FindString(_(L("Tool"))); if ((0 <= type) && (type < (int)GCodePreviewData::Extrusion::Num_View_Types))
int type = (number_extruders > 1) ? tool_idx /* color by a tool number */ : 0; // color by a feature type m_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type;
m_choice_view_type->SetSelection(type);
if ((0 <= type) && (type < (int)GCodePreviewData::Extrusion::Num_View_Types))
m_gcode_preview_data->extrusion.view_type = (GCodePreviewData::Extrusion::EViewType)type;
m_preferred_color_mode = (type == tool_idx) ? "tool_or_feature" : "feature"; m_preferred_color_mode = (type == tool_idx) ? "tool_or_feature" : "feature";
}
} }
} }