Tech ENABLE_WORLD_COORDINATE_SHOW_AXES merged into tech ENABLE_WORLD_COORDINATE

Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-05-13 14:27:18 +02:00
parent 7c86cf84a3
commit ebb9a4aadb
9 changed files with 74 additions and 72 deletions

View file

@ -1,7 +1,7 @@
#ifndef slic3r_CoordAxes_hpp_
#define slic3r_CoordAxes_hpp_
#if ENABLE_WORLD_COORDINATE_SHOW_AXES
#if ENABLE_WORLD_COORDINATE
#include "GLModel.hpp"
namespace Slic3r {
@ -59,6 +59,6 @@ public:
} // GUI
} // Slic3r
#endif // ENABLE_WORLD_COORDINATE_SHOW_AXES
#endif // ENABLE_WORLD_COORDINATE
#endif // slic3r_CoordAxes_hpp_