mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-10 08:17:51 -06:00
Merge branch 'master-remote' into SoftFever
# Conflicts: # bbl/i18n/BambuStudio.pot # bbl/i18n/de/BambuStudio_de.po # bbl/i18n/en/BambuStudio_en.po # bbl/i18n/es/BambuStudio_es.po # bbl/i18n/fr/BambuStudio_fr.po # bbl/i18n/hu/BambuStudio_hu.po # bbl/i18n/nl/BambuStudio_nl.po # bbl/i18n/sv/BambuStudio_sv.po # bbl/i18n/zh_cn/BambuStudio_zh_CN.po # resources/i18n/de/BambuStudio.mo # resources/i18n/en/BambuStudio.mo # resources/i18n/es/BambuStudio.mo # resources/i18n/fr/BambuStudio.mo # resources/i18n/hu/BambuStudio.mo # resources/i18n/nl/BambuStudio.mo # resources/i18n/sv/BambuStudio.mo # resources/i18n/zh_cn/BambuStudio.mo # resources/profiles/BBL.json # resources/profiles/Creality.json # resources/profiles/Voron.json # src/libslic3r/PrintConfig.cpp # src/libslic3r/TreeSupport.cpp # src/slic3r/GUI/DeviceManager.cpp # src/slic3r/GUI/ReleaseNote.cpp # version.inc
This commit is contained in:
commit
260156648d
104 changed files with 12137 additions and 1384 deletions
|
@ -99,7 +99,7 @@ enum SupportMaterialPattern {
|
|||
};
|
||||
|
||||
enum SupportMaterialStyle {
|
||||
smsGrid, smsSnug,
|
||||
smsDefault, smsGrid, smsSnug, smsTreeSlim, smsTreeStrong, smsTreeHybrid
|
||||
};
|
||||
|
||||
enum SupportMaterialInterfacePattern {
|
||||
|
@ -108,7 +108,19 @@ enum SupportMaterialInterfacePattern {
|
|||
|
||||
// BBS
|
||||
enum SupportType {
|
||||
stNormalAuto, stTreeAuto, stHybridAuto, stNormal, stTree
|
||||
stNormalAuto, stTreeAuto, stNormal, stTree
|
||||
};
|
||||
inline bool is_tree(SupportType stype)
|
||||
{
|
||||
return std::set<SupportType>{stTreeAuto, stTree}.count(stype) != 0;
|
||||
};
|
||||
inline bool is_tree_slim(SupportType type, SupportMaterialStyle style)
|
||||
{
|
||||
return is_tree(type) && (style==smsDefault || style==smsTreeSlim);
|
||||
};
|
||||
inline bool is_auto(SupportType stype)
|
||||
{
|
||||
return std::set<SupportType>{stNormalAuto, stTreeAuto}.count(stype) != 0;
|
||||
};
|
||||
|
||||
enum SeamPosition {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue