bubnikv
ca368a2116
Merge remote-tracking branch 'remotes/origin/et_custom_bed'
2019-07-30 16:48:47 +02:00
Lukas Matena
d3fe0564bb
Merge branch 'lm_sla_gizmo_undo'
2019-07-30 14:52:44 +02:00
YuSanka
a632cc86ba
Fix of #2401
2019-07-29 15:44:00 +02:00
Lukas Matena
b3ad06b655
Hiding the sla support structures after undo/redo
2019-07-28 11:37:08 +02:00
Enrico Turri
eb40cdef49
Code cleanup
2019-07-26 11:32:44 +02:00
Enrico Turri
b70057bdda
Refactoring into rendering pipeline
2019-07-26 09:45:22 +02:00
Enrico Turri
9e9e85dcf3
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo
2019-07-25 15:29:58 +02:00
Enrico Turri
95237ad560
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-25 15:29:25 +02:00
Enrico Turri
f160e2b623
Removed obsolete code
2019-07-25 15:28:34 +02:00
Enrico Turri
314ee4ae55
Custom bed texture applied to custom bed shapes
2019-07-24 10:11:17 +02:00
Enrico Turri
d14e0d2c90
1st installment for selection's undo/redo snapshots
2019-07-23 15:14:08 +02:00
Enrico Turri
adbc6392eb
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed
2019-07-22 11:57:17 +02:00
tamasmeszaros
538280748d
Update Arrange tooltip: [Shift+A]
2019-07-22 11:36:56 +02:00
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
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
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
53dc2efea5
Undo/Redo buttons moved into their own toolbar
2019-07-19 15:36:55 +02:00
Enrico Turri
d7a4560100
Refactoring in GLTexture
2019-07-19 11:18:19 +02:00
Enrico Turri
d40b4ae13c
Tech ENABLE_TEXTURES_FROM_SVG set as default
2019-07-19 09:52:01 +02:00
tamasmeszaros
3202db0943
Merge branch 'master' into tm_arrange_selection
2019-07-18 12:59:40 +02:00
Enrico Turri
3869be533f
Fixed rendering of toolbars' textures with prespective camera
2019-07-18 11:36:17 +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
Enrico Turri
459dd8f1af
Fixed use of translate macros
2019-07-17 14:13:50 +02:00
Enrico Turri
e4ca9488ce
Another refactoring of GLGizmosManager
2019-07-17 12:43:27 +02:00
Enrico Turri
9949bb1c1d
Added undo/redo snapshot for layers height editing
2019-07-17 10:03:00 +02:00
Enrico Turri
96681151a9
Framework to serialize gizmos into undo/redo stack
...
Serialization into undo/redo of Cut gizmo
Refactoring of GLGizmosManager
2019-07-17 08:38:48 +02:00
tamasmeszaros
b3217c191d
Priority for wipe tower, Increased safety distance from bed edges.
...
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
2019-07-16 18:33:42 +02:00
tamasmeszaros
b68d5950ac
Arrange cache in ModeInstance and logical bed remembered.
2019-07-15 17:30:44 +02:00
bubnikv
f2cc464319
Fix of the SLA Undo
2019-07-15 15:51:25 +02:00
bubnikv
d37b8faa52
Fix of the merge - missing Undo / Redo toolbar buttons.
2019-07-15 11:59:54 +02:00
bubnikv
e8e35579dd
Merge remote-tracking branch 'remotes/origin/vb_undo_redo'
2019-07-15 11:34:18 +02:00
Lukas Matena
ff69c030d7
Merge branch 'lm_improving_wipe_tower'. Summary of changes:
...
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
2019-07-15 10:25:38 +02:00
tamasmeszaros
9539a4860c
Not handling logical beds in arrange()
2019-07-12 21:17:11 +02:00
Enrico Turri
2f43e228f3
Tech ENABLE_SVG_ICONS set as default
2019-07-12 10:13:35 +02:00
Enrico Turri
cbf50ccdca
Follow-up of 4c6c608342 -> refactoring
2019-07-12 09:26:19 +02:00
Enrico Turri
9c184f5112
GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
...
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
Enrico Turri
b5624ca76f
Deactivate undo/redo toolbar items by pressing Esc key
2019-07-11 07:54:33 +02:00
Enrico Turri
747900c308
Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it
2019-07-11 07:46:40 +02:00
Enrico Turri
7ad87de236
GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos
2019-07-10 14:08:14 +02:00
Enrico Turri
107d3c0c82
Imgui dialogs for undo/redo centered on their toolbar item icon
2019-07-10 13:45:25 +02:00
YuSanka
c5a27bf798
Fixed redo_to() function and code cleaning from redundant options
2019-07-10 10:15:07 +02:00
YuSanka
237a46e311
Completed undo/redo from a toolbar
2019-07-09 20:45:00 +02:00
