Commit graph

4634 commits

Author SHA1 Message Date
enricoturri1966
af4fb2d174 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-11 16:11:19 +02:00
enricoturri1966
9566a05d8f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-11 16:09:22 +02:00
enricoturri1966
a1319cc8f7 Fixed restoring of application starting position 2020-06-11 16:07:28 +02:00
enricoturri1966
8c998e5f08 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_layout 2020-06-11 14:04:08 +02:00
enricoturri1966
920d9677da Added new tech ENABLE_LAYOUT_NO_RESTART -> Enable changing application layout without the need to restart it 2020-06-11 14:02:59 +02:00
YuSanka
f23a275fbb Merge remote-tracking branch 'origin/custom_gcodes' 2020-06-10 11:23:05 +02:00
YuSanka
1713142670 Imperial units selection is added to the ConfigWizard 2020-06-10 11:18:11 +02:00
enricoturri1966
0a7e2aa8da Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-10 09:00:53 +02:00
enricoturri1966
3b061fb4be Fixed serialization of position and size of the non modal settings dialog 2020-06-10 09:00:17 +02:00
YuSanka
bf9462749f Fixed Editing of the Template custom Gcode
Fixed reloading of the legend, when preview type was changed
2020-06-09 17:10:48 +02:00
enricoturri1966
4c51a258ef GCodeViewer -> Fixed bottom panel not disappearing when switching to gcode viewer from preview 2020-06-09 12:44:22 +02:00
enricoturri1966
48cc358b72 Fixed build on Mac 2020-06-09 11:44:25 +02:00
enricoturri1966
345c01c54f ENABLE_GCODE_VIEWER -> Updated keyboard shortcuts dialog 2020-06-09 08:37:24 +02:00
enricoturri1966
d358fe85fa GCodeViewer -> Show tool marker position when enabled 2020-06-09 08:12:51 +02:00
enricoturri1966
9f94f89808 ENABLE_GCODE_VIEWER_AS_STATE -> Smoother transition between states 2020-06-08 14:37:40 +02:00
enricoturri1966
ea0e9a5873 Follow-up of 70478f226f -> Fixed printbed for regular gcode preview 2020-06-08 13:17:07 +02:00
enricoturri1966
70478f226f ENABLE_GCODE_VIEWER_AS_STATE -> Use default printbed in gcode viewer 2020-06-08 12:27:32 +02:00
YuSanka
befbd6b0fe Merge remote-tracking branch 'origin/master' into custom_gcodes 2020-06-08 12:27:29 +02:00
YuSanka
43cfd44864 Fixed export/import from/to amf and 3mf file. 2020-06-08 12:25:29 +02:00
enricoturri1966
ca17948f87 ENABLE_GCODE_VIEWER_AS_STATE -> Load gcode from file and process it 2020-06-08 09:12:20 +02:00
YuSanka
629584e28f Editing of the custom GCodes like ColorChange and PausePrint 2020-06-07 22:42:54 +02:00
enricoturri1966
bd5a5bf78f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-06-05 16:51:11 +02:00
enricoturri1966
70a6fb0e20 Added new tech ENABLE_GCODE_VIEWER_AS_STATE -> GCodeViewer as a new application state (WIP) + fix of conflicts after merge with master 2020-06-05 16:50:17 +02:00
enricoturri1966
13a2e8e64d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-05 14:25:29 +02:00
enricoturri1966
2b19f471bd Follow-up of 4f63095d9a -> Collapse toolbar disabled by default 2020-06-05 14:25:15 +02:00
YuSanka
530786fca4 Object merge: fixed merge of the objects with changed rotation, scale and mirror
+ Fixed get_object_stl_stats()
2020-06-05 13:15:49 +02:00
enricoturri1966
4f63095d9a Collapse toolbar moved from GLCanvas3D to Plater::priv 2020-06-05 12:33:09 +02:00
Vojtech Bubnik
1e3290fee1 Reduced ugly copy / paste for ENABLE_OPENGL_ERROR_LOGGING 2020-06-04 15:53:58 +02:00
enricoturri1966
ad7e7ae1cd Added tech ENABLE_OPENGL_ERROR_LOGGING -> log opengl errors when SLIC3R_LOGLEVEL=5 2020-06-04 14:48:52 +02:00
enricoturri1966
c3d643ead3 Fixed conflicts after merge with master 2020-06-04 13:57:39 +02:00
Lukas Matena
1e5d1cb616 Fixed a crash when switching from SLA to FDM with a gizmo active
If a gizmo used SupportsClipper or HollowedMesh common data, it would attempt to update from a dead SLAPrintObject
2020-06-03 16:39:12 +02:00
Lukas Matena
ed98a859af Fix of #3919 (extremely wide wipe tower with 0.35mm FAST profile)
This is an excerpt from ec86d94, which was recently reverted because
the other changes from that commit broke some functionality.
2020-06-03 15:34:33 +02:00
Lukas Matena
2cc1dffc82 Fix of several issues related to gizmos updating and undo/redo
Common gizmos data cannot be used in on_set_state method
Also prevented calling render on empty GLVertexArrays
2020-06-03 15:33:39 +02:00
Lukas Matena
dc725ecbad Fixup of previous commit 2020-06-02 14:49:40 +02:00
Lukas Matena
a4d30fc9bb Fixed a crash when switching between tabs
Introduced in ba963ac
2020-06-02 11:42:25 +02:00
enricoturri1966
06a8bfa588 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-06-02 10:03:00 +02:00
enricoturri1966
aa92cbf051 New tech ENABLE_SMOOTH_NORMALS (disabled) -> Added two experimental functions to smooth normals using libigl (none of them working properly in detecting edges) when calling GLIndexedVertexArray::load_mesh_full_shading() 2020-06-02 10:02:50 +02:00
YuSanka
9146ef2f61 Copy/Paste for the Settings and Layers in the ObjectList 2020-06-01 11:11:38 +02:00
enricoturri1966
707268d41d ENABLE_GCODE_VIEWER -> Improvements in shaders for options 2020-06-01 08:55:44 +02:00
enricoturri1966
71db69ef41 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer 2020-05-29 12:29:24 +02:00
enricoturri1966
dcec684cc7 ENABLE_GCODE_VIEWER -> Refactoring of shaders for options 2020-05-29 12:29:04 +02:00
Lukas Matena
21de9d23ec Bugfix: Cut gizmo ignored SLA elevation and the cut ended up shifted
It is still possible to set the plane into the space under an object,
but at least it always cuts where indicated.
2020-05-28 16:15:49 +02:00
enricoturri1966
e9d57c932a Fixed conflicts after merge with master 2020-05-28 15:50:21 +02:00
enricoturri1966
0599dc4df7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-05-28 15:27:39 +02:00
enricoturri1966
c63e03c367 1st installment of tech ENABLE_ENVIRONMENT_MAP 2020-05-28 15:27:29 +02:00
YuSanka
ba963ac404 Save a position and size of the settings dialog
+ Added a check of the printer technology inside can_merge_to_multipart_object() => suppress merge for the SLA printing
+ clear MainFrame.cpp from unused commented code
2020-05-28 14:38:56 +02:00
Lukas Matena
b376e2c703 FDM supports gizmo: clicking the clipping plane starts painting 2020-05-28 13:10:40 +02:00
enricoturri1966
96db6aaadb Attempt to fix rambling crash on Mac Asan 2020-05-28 11:14:56 +02:00
enricoturri1966
2904ee6e1a Added missing include 2020-05-28 09:38:08 +02:00
enricoturri1966
9c8892c869 GCodeViewer -> Shaders code cleanup 2020-05-28 09:23:30 +02:00