bubnikv
cefe0ba13c
Merge remote-tracking branch 'remotes/origin/dk_copy_file'
2019-12-20 15:08:31 +01:00
bubnikv
ec91a92ba0
Merge remote-tracking branch 'remotes/origin/dk_remote_devices'
2019-12-20 15:07:49 +01:00
bubnikv
4c64f8c3ce
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-12-20 15:07:35 +01:00
tamasmeszaros
93d0bbd7ef
Add boilerplate for shader based csg
2019-12-20 12:25:44 +01:00
Enrico Turri
e9bb3c2450
3mf and amf import: keep loaded volumes transformation as a member of ModelVolume without applying it to the mesh
2019-12-20 12:11:58 +01:00
Lukas Matena
4d182a5748
Fixed scaling of the holes and instance showing/hiding
2019-12-20 11:33:14 +01:00
Lukas Matena
b3f15b1c98
Merge branch 'master' into lm_tm_hollowing
2019-12-20 10:33:53 +01:00
Lukas Matena
cfd0fa9ae5
Merge branch 'lm_common_gizmos_data' into lm_tm_hollowing
2019-12-20 10:24:37 +01:00
Lukas Matena
d1f86e0a80
SLA supports gizmo now uses hollowed mesh when available
...
Bugfix: SLA support tree is is now given the hollowed mesh, not the original
Added ImGui separators and change background alpha in hollowing gizmo dialog (to match the other gizmos)
2019-12-20 10:17:59 +01:00
tamasmeszaros
4f97a7122f
Fix closing while playback
2019-12-20 01:21:25 +01:00
David Kocik
74e24213e6
boost::filesystem instead std::
2019-12-19 17:05:23 +01:00
David Kocik
58a8e9e7e0
Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices
2019-12-19 16:28:28 +01:00
David Kocik
8d52663871
free space check linux + mac
2019-12-19 16:27:48 +01:00
tamasmeszaros
4e5310d72f
Merge branch 'tm_opencsg' into origin/lm_tm_hollowing
2019-12-19 16:11:04 +01:00
tamasmeszaros
d3925abb13
Add some comments.
2019-12-19 16:10:34 +01:00
David Kocik
31b134bfcc
copy file into .tmp and then rename if correct
2019-12-19 15:36:00 +01:00
tamasmeszaros
9363344a6f
Merge branch 'tm_opencsg' into lm_tm_hollowing
2019-12-19 15:27:55 +01:00
tamasmeszaros
bb8a6b898f
Save and load window size. Add fps average output.
2019-12-19 15:26:04 +01:00
David Kocik
dafd768b34
Merge branch 'dk_remote_devices' into dk_copy_file
2019-12-19 14:55:49 +01:00
tamasmeszaros
8126cdd507
Add command line options. Rename GLScene to Engine
2019-12-19 14:51:38 +01:00
David Kocik
d7698a36cb
changes in plater.cpp
2019-12-19 14:19:41 +01:00
bubnikv
26b7dbd6f5
Improved accuracy of ModelVolume matrix store / restore
...
into the 3MF / AMF.
Improved accuracy of ModelVolume's mesh transform back from Object's
coordinate space to its own coordinate space after reloading
from 3MF / AMF.
2019-12-19 12:27:49 +01:00
bubnikv
2bf472988b
We can now use std::exchange() as we switched to C++17
2019-12-19 12:27:49 +01:00
tamasmeszaros
71ff0f9cae
Merge branch 'tm_fix_pad'
2019-12-19 12:04:58 +01:00
David Kocik
7b95ec486f
ommit last filename when checking if path is on drive
2019-12-19 11:47:02 +01:00
Enrico Turri
feaccc557d
Partial revert of cc919c68b8
2019-12-19 11:38:48 +01:00
tamasmeszaros
42ffc4e3c5
Fix polytree traversal.
...
Put back old traverse_pt and union_pt_chained
2019-12-19 11:27:19 +01:00
David Kocik
3d08e8ae32
is path on removable drive
2019-12-19 11:13:27 +01:00
tamasmeszaros
2feb8421e9
Divide pad blueprint before its filtered.
...
Filtering may remove the outer pad and the division expects an outer part to be present.
2019-12-19 10:59:21 +01:00
David Kocik
2ee2180869
Merge branch 'dk_remote_devices' into dk_copy_file
2019-12-19 10:11:16 +01:00
Enrico Turri
3b8d42a64f
Fixed selection after cut command
2019-12-19 10:06:46 +01:00
Enrico Turri
f8adf99c8d
Rolled back version numbers for 3mf and amf files
2019-12-19 09:41:30 +01:00
Enrico Turri
fecd89fa38
Do not allow to apply reload from disk command to objects whose mesh has been modified after non uniform scale operations
2019-12-19 09:21:57 +01:00
Enrico Turri
7013f148b5
Store new source path in ModelVolume after reload from disk
2019-12-19 09:02:50 +01:00
David Kocik
3a54279cec
Merge branch 'master' into dk_remote_devices
2019-12-19 08:58:11 +01:00
Enrico Turri
750ea439bb
Do not allow to apply reload from disk command to objects splitted using split to objects or split to volumes commands
2019-12-19 08:05:57 +01:00
tamasmeszaros
bf44da0e37
Make it work with mesa sw renderer
2019-12-19 01:55:46 +01:00
bubnikv
fd3651d994
Fixed C++17 incompatibility.
2019-12-18 18:14:06 +01:00
tamasmeszaros
fafc2a3510
Recording and playback works
2019-12-18 16:24:41 +01:00
YuSanka
0802823703
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-12-18 15:58:24 +01:00
YuSanka
07f428fe62
Implemented function to get an icon name considering to OS color mode
...
For a Dark mode we start to looking of icons in folder "white"
Added missed "white" icons
2019-12-18 15:54:01 +01:00
tamasmeszaros
8f655242eb
Fix for CGAL relocation fix. Wrong libdir was used.
2019-12-18 15:42:53 +01:00
David Kocik
1361d21f75
is path on removable drive
2019-12-18 15:40:48 +01:00
Enrico Turri
c9dcf3e865
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-12-18 15:33:12 +01:00
Enrico Turri
b2b037eb0b
Show requested filename on title of reload from disk dialog on Mac
2019-12-18 15:32:25 +01:00
bubnikv
74d6c23ba8
Updated Prusa3D config - elephant foot compensation 0.2mm
...
allowed for all profiles but 0.25mm dmr nozzles.
2019-12-18 15:30:00 +01:00
David Kocik
ef250ad539
copy check only if path is on removable device
2019-12-18 14:09:16 +01:00
David Kocik
11f07f277f
Merge branch 'dk_remote_devices' into dk_copy_file
2019-12-18 13:14:14 +01:00
David Kocik
a68ede6f2d
check_copy function
2019-12-18 13:13:40 +01:00
tamasmeszaros
472c4c885d
Separate fps counter and remove glut dependency
2019-12-18 12:00:28 +01:00
