3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed conflicts after merge with dev branch

Browse source
This commit is contained in:
enricoturri1966 2022-01-12 15:54:48 +01:00
commit a2dc1cd446
147 changed files with 435771 additions and 1275 deletions
src/slic3r/GUI
GCodeViewer.hpp

8
src/slic3r/GUI/GCodeViewer.hpp
View file

@ -482,9 +482,8 @@ class GCodeViewer
size_t first{ 0 };
size_t last{ 0 };
bool operator == (const Endpoints& other) const {
return first == other.first && last == other.last;
}
bool operator == (const Endpoints& other) const { return first == other.first && last == other.last; }
bool operator != (const Endpoints& other) const { return !operator==(other); }
};
private:
@ -513,9 +512,8 @@ class GCodeViewer
bool operator != (const Layers& other) const {
if (m_zs != other.m_zs)
return true;
if (!(m_endpoints == other.m_endpoints))
if (m_endpoints != other.m_endpoints)
return true;
return false;
}
};