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

Merge branch 'master' into fs_mouse

Browse source 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
This commit is contained in:
Filip Sykala 2022-02-08 10:43:29 +01:00
commit 0c40e2f8c8
201 changed files with 259341 additions and 50166 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -59,7 +59,7 @@ protected:
private:
double calc_projection(const UpdateData& data) const;
void render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking) const;
void render_grabber_extension(Axis axis, const BoundingBoxf3& box, bool picking);
};