Fixed some more warnings, moved function to get ExtrusionRole name into ExtrusionEntity.hpp

So it can be called from wherever it may be needed
This commit is contained in:
Lukas Matena 2019-09-06 14:58:04 +02:00
parent 3f988b314c
commit a985a2720f
9 changed files with 105 additions and 123 deletions

View file

@ -1074,8 +1074,8 @@ const std::vector<std::string>& ObjectList::get_options_for_bundle(const wxStrin
static bool improper_category(const std::string& category, const int extruders_cnt, const bool is_object_settings = true)
{
return category.empty() ||
extruders_cnt == 1 && (category == "Extruders" || category == "Wipe options" ) ||
!is_object_settings && category == "Support material";
(extruders_cnt == 1 && (category == "Extruders" || category == "Wipe options" )) ||
(!is_object_settings && category == "Support material");
}
void ObjectList::get_options_menu(settings_menu_hierarchy& settings_menu, const bool is_part)