merge with master

This commit is contained in:
David Kocik 2019-12-18 10:45:16 +01:00
commit df36a7dcb2
6 changed files with 63 additions and 14 deletions

View file

@ -965,7 +965,7 @@ private:
bool operator<(const TICK_CODE& other) const { return other.tick > this->tick; }
bool operator>(const TICK_CODE& other) const { return other.tick < this->tick; }
int tick;
int tick = 0;
std::string gcode = Slic3r::ColorChangeCode;
int extruder = 0;
std::string color;