Commit Graph

4442 Commits

Author SHA1 Message Date
Enrico Turri
c1283e0453 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 11:26:02 +02:00
tamasmeszaros
71f08c797e Merge branch 'tm_arrange_selection' 2019-07-22 11:14:34 +02:00
YuSanka
72158e78c9 Added checking for a extruder value in ObjectList. Set value to "default" if "0" is selected. 2019-07-22 10:28:25 +02:00
YuSanka
2f50c02285 Fix of SPE-987 (Slicer crash when layers are selected in right panel and settings is added) 2019-07-22 09:41:34 +02:00
bubnikv
52d70ddfef Merge branch 'master' into ys_overrides 2019-07-22 09:36:55 +02:00
Enrico Turri
9f742ddaa3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 08:21:40 +02:00
enricoturri1966
10212a1042 Added additional tooltip to toolbar items and use it for undo/redo items 2019-07-20 14:03:34 +02:00
enricoturri1966
3924f14452 Reworked rendering of toolbars background texture 2019-07-20 12:02:29 +02:00
tamasmeszaros
124aa9a8ef Merge branch 'master' into tm_arrange_selection 2019-07-19 18:17:58 +02:00
tamasmeszaros
6224c2e460 Dont do force_full_scene_refresh after arrange. 2019-07-19 18:16:36 +02:00
tamasmeszaros
31ca157cdf Arrange selection if shift is pressed. Remove first item centering 2019-07-19 18:10:10 +02:00
Vojtech Kral
3a30c45348 Fix a memory access bug in ObjectManipulation 2019-07-19 17:58:46 +02:00
bubnikv
83d6589be1 Fix of OSX Imgui Undo / Redo pull down list scaling issue. 2019-07-19 17:16:20 +02:00
bubnikv
d99da4b01b Simplified loading of the SLA support structures into the scene.
Fixed referesh of SLA support structures after Undo / Redo
and when moving an object outside / inside the build volume.
2019-07-19 17:14:37 +02:00
bubnikv
8eba63c697 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 15:59:35 +02:00
bubnikv
2824a1531e Undo / Redo pull down menu scaling fix on OSX Retina 2019-07-19 15:59:23 +02:00
Enrico Turri
9f741dd46b Fixed conflicts after pulling from master 2019-07-19 15:47:10 +02:00
Enrico Turri
e59454652b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-19 15:37:10 +02:00
Enrico Turri
53dc2efea5 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
bubnikv
5945c13ae6 Undo / Redo. Workaround for the Wipe tower. 2019-07-19 15:29:04 +02:00
Enrico Turri
ae711d251a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 11:36:07 +02:00
Enrico Turri
d7a4560100 Refactoring in GLTexture 2019-07-19 11:18:19 +02:00
bubnikv
1f727bca37 Memory statistics (total memory, memory usage, Undo / Redo stack size)
into the System INfo dialog.
2019-07-19 11:12:38 +02:00
bubnikv
f4fa4ff6e4 Adding a generic bitmap "flags" attrib to the Undo / Redo snapshot.
using this new "flags" attrib to store & recover the "Layers editing active"
flag and restoring the "Layers editing" tool state.
2019-07-19 10:29:06 +02:00
Enrico Turri
d40b4ae13c Tech ENABLE_TEXTURES_FROM_SVG set as default 2019-07-19 09:52:01 +02:00
Enrico Turri
c1f6dd7b06 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 09:18:32 +02:00
Enrico Turri
6f6309fb64 Render custom bed textures in png format on prusa beds 2019-07-19 09:18:09 +02:00
bubnikv
e103460386 Storing the active printer technology onto the Undo / Redo stack,
remembering the last selected Printer profile for the SLA and FDM
technologies separately, and activating them on Undo / Redo.

When switching the technologies, user is asked whether to discard
the modified profiles or not.
2019-07-18 17:41:47 +02:00
tamasmeszaros
698c2de245 Further refactoring 2019-07-18 17:31:27 +02:00
tamasmeszaros
58581347c9 Minor refactor 2019-07-18 16:30:32 +02:00
Enrico Turri
960359b848 Small refactoring 2019-07-18 15:03:05 +02:00
Enrico Turri
9c9b29a8a9 Render custom bed textures in svg format on prusa beds 2019-07-18 14:39:19 +02:00
bubnikv
701a94bdb6 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-18 13:08:48 +02:00
tamasmeszaros
3202db0943 Merge branch 'master' into tm_arrange_selection 2019-07-18 12:59:40 +02:00
Enrico Turri
ad1482c09a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 12:57:12 +02:00
Enrico Turri
0425cb77b3 Added selection of custom bed model to bed shape dialog 2019-07-18 12:56:52 +02:00
Enrico Turri
8603f6eeb3 Partially revert 8febd88e80 2019-07-18 12:03:41 +02:00
Enrico Turri
3869be533f Fixed rendering of toolbars' textures with prespective camera 2019-07-18 11:36:17 +02:00
Enrico Turri
74ce479402 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 11:12:30 +02:00
Enrico Turri
dfb9d127d4 Added selection of custom bed texture to bed shape dialog 2019-07-18 11:12:11 +02:00
tamasmeszaros
af93cc0e20 Fixes after merge with master. 2019-07-17 18:10:08 +02:00
tamasmeszaros
d55dbf437c Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +02:00
bubnikv
5a24b6af21 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-17 15:54:57 +02:00
bubnikv
d30229cc5f WIP: Undo / Redo memory limiting by releasing the least recently
used snapshots. Memory limit set to 10% of physical system memory.
2019-07-17 15:48:53 +02:00
Lukas Matena
de9581304a 'Place on face' gizmo fix (it used invalid pointer after undo/redo was implemented) 2019-07-17 15:39:58 +02:00
Lukas Matena
c2631875f6 SLA support points edits are now pushed onto undo/redo stack 2019-07-17 15:39:58 +02:00
Enrico Turri
5353f8bae5 Refactoring of BedShapePanel and BedShapeDialog 2019-07-17 14:53:02 +02:00
Enrico Turri
b09bd77eb4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-17 14:28:12 +02:00
Enrico Turri
459dd8f1af Fixed use of translate macros 2019-07-17 14:13:50 +02:00
tamasmeszaros
3eeb453e9a Solved issue with virtual bed management.
libnest2d: Fix for unclosed polygons after merge.
2019-07-17 13:32:31 +02:00