eb0b3aea09
Fixed conflicts after merge with master
2019-02-22 09:11:49 +01:00
14b4685ecb
Scaling in PrintHostDialogs, FirmwareDialog, UpdateDialogs
2019-02-21 19:00:50 +01:00
051ca410f6
More input handling fixes
2019-02-21 19:00:50 +01:00
cb900aa5bc
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-02-21 15:46:23 +01:00
ac0c7e8065
Optimization of SLA print time estimation,
...
moved SLA print time estimation calculation into rasterization step,
so that the print time estimation is tracked by some SLAPrintStep.
Extended the output file name generator to use the SLA print statistics.
2019-02-21 15:46:04 +01:00
bf699462c3
imgui: Attempt to fix Tab key
2019-02-21 13:17:26 +01:00
37ab271803
Merge remote-tracking branch 'origin/ys_sla_time_estimation'
2019-02-21 13:11:16 +01:00
73daf085e6
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-02-21 12:39:52 +01:00
76f1aa09d0
Fixed an issue with background processing cancelation & SLA supports
...
for a single object only.
Fixed a spelling issue in "call_cancell_xxx"
2019-02-21 12:39:38 +01:00
1b30ac1f89
Fix Preview legend scaling
2019-02-21 12:20:06 +01:00
b84eb48bff
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-02-21 12:09:16 +01:00
8d09508ca8
SLA supports: Update only supports for the selected object from iside
...
the SLA support gizmo.
2019-02-21 12:09:03 +01:00
bfdd702134
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
2019-02-21 11:44:15 +01:00
3ccfe7f53e
Fixed OSX-build
2019-02-21 11:44:01 +01:00
22a15e7e25
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-02-21 11:41:04 +01:00
159041747d
WIP: SLA support "Generate points" and "Apply Changes" will reslice
...
just the selected object.
Added "Host upload active" check on background processing state.
Documented requirements on "update_background_process" to
control the upcoming single "Slice Now" / "Export" button.
2019-02-21 11:40:56 +01:00
882de2843e
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-02-21 10:18:37 +01:00
5bc20401cd
Fix of #1801
2019-02-21 10:13:05 +01:00
c86a4f3ac6
Fix of "Change of object type support blocker to enforcer does nothing (and vice versa) ( #1818 )"
...
WIP: Limited background processing for SLA supports.
2019-02-21 08:44:07 +01:00
2eb0b6d1b4
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
2019-02-21 08:20:44 +01:00
478032ad28
imgui: Fix char input handling
2019-02-20 16:55:00 +01:00
cb8677b310
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-02-20 16:20:52 +01:00
c55629259a
Merge remote-tracking branch 'origin/ys_hdpi'
2019-02-20 16:20:30 +01:00
47e04ec8e5
imgui: Tweak style
2019-02-20 16:12:41 +01:00
1045b43d4f
imgui: Input fixes
2019-02-20 16:12:41 +01:00
5de52b7da4
imgui: Fix keyboard modifiers on Mac
2019-02-20 16:12:41 +01:00
2de814d478
Imgui: Implement keyboard input, fix #1797
2019-02-20 16:12:41 +01:00
3901ac47d1
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-02-20 15:54:25 +01:00
4e9372c58b
Merge fixes
2019-02-20 15:54:12 +01:00
5292f16f32
SLA gizmo - clicking on object does not add new points if any point is selected
...
Remove selected points button is greyed out unless something is selected
2019-02-20 15:42:03 +01:00
82337d9295
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
2019-02-20 15:31:55 +01:00
11fc849b1a
Printbed textures generated from svg files
2019-02-20 15:23:23 +01:00
b0d78c3fb2
Place on bed fix (incorrect usage of sla z-shift)
2019-02-20 15:15:00 +01:00
fb8c66f223
Merge remote-tracking branch 'origin/master' into ys_sla_time_estimation
2019-02-20 15:14:53 +01:00
98a551587c
Improved used material estimation (take instances too)
2019-02-20 15:13:03 +01:00
84f22ed50b
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-02-20 15:07:43 +01:00
32ce0b91dc
Merge remote-tracking branch 'remotes/origin/tm_pad_speedup'
2019-02-20 15:07:43 +01:00
0b0457186b
ENABLE_ANISOTROPIC_FILTER_ON_BED_TEXTURES set as default
2019-02-20 13:53:33 +01:00
e2731416bf
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
2019-02-20 13:50:54 +01:00
cb1ef36ceb
ENABLE_UNIQUE_BED set as default
2019-02-20 13:50:35 +01:00
3aa97a6f3f
Merge branch 'lm_sla_supports_auto2'
2019-02-20 13:17:29 +01:00
7443868e87
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models
2019-02-20 13:16:39 +01:00
574cb53bff
Revert "Fixed a missing include problem in SLASupportAuto.hpp"
...
This is already solved in master branch by including the header
This reverts commit b7465e935e
2019-02-20 13:16:09 +01:00
b7465e935e
Fixed a missing include problem in SLASupportAuto.hpp
2019-02-20 12:28:57 +01:00
da5a16d962
Fix of the SLA situation where an object was sliced even after being
...
moved out of the print bed.
Added an event.Skip() when processing OnActivate event.
2019-02-20 12:21:22 +01:00
2759c87e5b
WarningTexture class in GLCanvas3D modified so it can be used more universally
...
Added a warning to notify that some objects are not rendered with SLA gizmo active
2019-02-20 12:09:45 +01:00
771a3d3b14
Reordered SLA background processing:
...
Calculate the SLA supports first before continuing with slicing
the SLA supports, which is time consuming.
2019-02-20 11:58:09 +01:00
74eb903054
Fixed a missing include.
2019-02-20 11:16:31 +01:00
464808ac49
Merge branch 'lm_sla_supports_auto2'
2019-02-20 10:58:34 +01:00
9a8a9bac28
Merge branch 'lm_sla_supports_auto2' of https://github.com/prusa3d/Slic3r into lm_sla_supports_auto2
2019-02-20 10:47:44 +01:00
