GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-28 22:02:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix merge

Browse Source
This commit is contained in:
supermerill 2019-02-12 10:54:45 +01:00
parent 95a6ea1477
commit a0628ff50b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -526,17 +526,17 @@ std::string GLCanvas3D::Bed::_detect_type() const
{ {
if (boost::contains(curr->name, "SL1")) if (boost::contains(curr->name, "SL1"))
{ {
type = SL1; type = "SL1";
break; break;
} }
else if (boost::contains(curr->name, "MK3") || boost::contains(curr->name, "MK2.5")) else if (boost::contains(curr->name, "MK3") || boost::contains(curr->name, "MK2.5"))
{ {
type = MK3; type = "MK3";
break; break;
} }
else if (boost::contains(curr->name, "MK2")) else if (boost::contains(curr->name, "MK2"))
{ {
type = MK2; type = "MK2";
break; break;
} }
} }

2
src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -227,7 +227,7 @@ class GLCanvas3D
Bed(); Bed();
#if ENABLE_REWORKED_BED_SHAPE_CHANGE #if ENABLE_REWORKED_BED_SHAPE_CHANGE
EType get_type() const { return m_type; } std::string get_type() const { return m_type; }
#endif // ENABLE_REWORKED_BED_SHAPE_CHANGE #endif // ENABLE_REWORKED_BED_SHAPE_CHANGE
bool is_prusa() const; bool is_prusa() const;