PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-14 19:12:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
enricoturri1966
2020-05-28 15:50:21 +02:00
parent 96db6aaadb 0599dc4df7
commit e9d57c932a
18 changed files with 230 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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();