Commit graph

2331 commits

Author SHA1 Message Date
Enrico Turri
c1dee0e87d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 11:26:02 +02:00
tamasmeszaros
dcb073d4fd Merge branch 'tm_arrange_selection' 2019-07-22 11:14:34 +02:00
YuSanka
fb39516c65 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
f6633df57b 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
Enrico Turri
9cb1a584e1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-22 08:21:40 +02:00
enricoturri1966
b60b44ed5e Added additional tooltip to toolbar items and use it for undo/redo items 2019-07-20 14:03:34 +02:00
enricoturri1966
33c0683d11 Reworked rendering of toolbars background texture 2019-07-20 12:02:29 +02:00
tamasmeszaros
8d66b51e8c Merge branch 'master' into tm_arrange_selection 2019-07-19 18:17:58 +02:00
tamasmeszaros
10e86a06cc Dont do force_full_scene_refresh after arrange. 2019-07-19 18:16:36 +02:00
tamasmeszaros
63fada9469 Arrange selection if shift is pressed. Remove first item centering 2019-07-19 18:10:10 +02:00
Vojtech Kral
99e2fe20a5 Fix a memory access bug in ObjectManipulation 2019-07-19 17:58:46 +02:00
bubnikv
47df9506bb Fix of OSX Imgui Undo / Redo pull down list scaling issue. 2019-07-19 17:16:20 +02:00
bubnikv
07a3072622 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
ba997be812 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 15:59:35 +02:00
bubnikv
152c2fe0c0 Undo / Redo pull down menu scaling fix on OSX Retina 2019-07-19 15:59:23 +02:00
Enrico Turri
3285bf7945 Fixed conflicts after pulling from master 2019-07-19 15:47:10 +02:00
Enrico Turri
91d574f8ad Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-19 15:37:10 +02:00
Enrico Turri
81d3669a25 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
bubnikv
dbc1918193 Undo / Redo. Workaround for the Wipe tower. 2019-07-19 15:29:04 +02:00
Enrico Turri
37f2362aab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 11:36:07 +02:00
Enrico Turri
749bb2bfed Refactoring in GLTexture 2019-07-19 11:18:19 +02:00
bubnikv
2de6d95322 Memory statistics (total memory, memory usage, Undo / Redo stack size)
into the System INfo dialog.
2019-07-19 11:12:38 +02:00
bubnikv
d9c325c7f0 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
84d61e28fd Tech ENABLE_TEXTURES_FROM_SVG set as default 2019-07-19 09:52:01 +02:00
Enrico Turri
3344650255 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 09:18:32 +02:00
Enrico Turri
ba4bc8ac82 Render custom bed textures in png format on prusa beds 2019-07-19 09:18:09 +02:00
bubnikv
4049f33609 Fix of osx builds 2019-07-18 18:19:40 +02:00
bubnikv
a0ea96968d 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
6ae50a710a Further refactoring 2019-07-18 17:31:27 +02:00
tamasmeszaros
e3ca95152c Minor refactor 2019-07-18 16:30:32 +02:00
Enrico Turri
1c5ff3c72d Small refactoring 2019-07-18 15:03:05 +02:00
Enrico Turri
f61d43de07 Render custom bed textures in svg format on prusa beds 2019-07-18 14:39:19 +02:00
bubnikv
631a952f94 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-18 13:08:48 +02:00
tamasmeszaros
6b8c72944d Merge branch 'master' into tm_arrange_selection 2019-07-18 12:59:40 +02:00
Enrico Turri
af3cb890d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 12:57:12 +02:00
Enrico Turri
de383b1809 Added selection of custom bed model to bed shape dialog 2019-07-18 12:56:52 +02:00
Enrico Turri
44d7462bdb Partially revert 8febd88e80 2019-07-18 12:03:41 +02:00
bubnikv
cd95b52dcd Undo / Redo memory conservation strategy: Release recoverable data
starting from the objects of lowest ObjectID.
(convex hulls are recoverable as well as the indexed triangle sets
inside the TriangleMeshes or the triangle connectivity information).

Now the top most snapshot (the temp one taken before Undo jump) will
never be released.
2019-07-18 11:51:06 +02:00
Enrico Turri
8febd88e80 Fixed rendering of toolbars' textures with prespective camera 2019-07-18 11:36:17 +02:00
Enrico Turri
1e796b82e1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 11:12:30 +02:00
Enrico Turri
08d37aad06 Added selection of custom bed texture to bed shape dialog 2019-07-18 11:12:11 +02:00
tamasmeszaros
6949543912 Fixes after merge with master. 2019-07-17 18:10:08 +02:00
tamasmeszaros
a695dec51a Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +02:00
bubnikv
cc1338ce6a Fix after merge 2019-07-17 16:00:09 +02:00
bubnikv
7176599a34 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-17 15:54:57 +02:00
bubnikv
3a74e7ab69 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
2b9d285a16 'Place on face' gizmo fix (it used invalid pointer after undo/redo was implemented) 2019-07-17 15:39:58 +02:00
Lukas Matena
81dde630ea SLA support points edits are now pushed onto undo/redo stack 2019-07-17 15:39:58 +02:00
Enrico Turri
75c53a53b6 Refactoring of BedShapePanel and BedShapeDialog 2019-07-17 14:53:02 +02:00
Enrico Turri
ce5618fb27 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-17 14:28:12 +02:00