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

Fixed conflicts after merge with master

Browse source
This commit is contained in:
enricoturri1966 2020-05-28 15:50:21 +02:00
commit e9d57c932a
18 changed files with 230 additions and 58 deletions
src/slic3r/GUI
GCodeViewer.cpp

1
src/slic3r/GUI/GCodeViewer.cpp
View file

@ -770,7 +770,6 @@ void GCodeViewer::render_toolpaths() const
double zoom = camera.get_zoom();
const std::array<int, 4>& viewport = camera.get_viewport();
std::array<int, 2> viewport_sizes = { viewport[2], viewport[3] };
const std::pair<double, double>& camera_z_range = camera.get_z_range();
Transform3d inv_proj = camera.get_projection_matrix().inverse();