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-03 10:33:16 +01:00
commit aaaea68d99
133 changed files with 131802 additions and 151395 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
View file

@ -20,7 +20,8 @@ class GLGizmoMove3D : public GLGizmoBase
Vec3d m_starting_drag_position{ Vec3d::Zero() };
Vec3d m_starting_box_center{ Vec3d::Zero() };
Vec3d m_starting_box_bottom_center{ Vec3d::Zero() };
GLModel m_vbo_cone;
GLModel m_cone;
public:
GLGizmoMove3D(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);