Commit Graph

13712 Commits

Author SHA1 Message Date
YuSanka
ebf9f64484 Fixed a bug of settings list detection
,when we try to add settings for object/part from the 3Dscene secondary
and for this moment SettingsItem is selected in ObjectList
2019-12-12 13:42:13 +01:00
Enrico Turri
ab04bab388 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 13:38:26 +01:00
Enrico Turri
c850d600c3 Fixed positioning of gizmos' imgui dialogs 2019-12-12 13:38:08 +01:00
Lukas Matena
a69f1912b2 Removed an obsolete variable from MeshRaycaster 2019-12-12 13:19:16 +01:00
tamasmeszaros
cce93c47e4 Try to fix deps build on win32 with forwarding CMAKE_GENERATOR_PLATFORM 2019-12-12 13:09:57 +01:00
bubnikv
905bbefc39 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-12 12:11:37 +01:00
Lukas Matena
11feb259a3 Merge branch 'master' into lm_tm_hollowing 2019-12-12 11:37:33 +01:00
Enrico Turri
38a7c45c21 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 11:11:20 +01:00
Enrico Turri
4d581a8778 Refactoring in GLGizmosManager to simplify code 2019-12-12 11:11:11 +01:00
David Kocik
684e6ae517 eject button after export 2019-12-12 10:48:33 +01:00
Lukas Matena
4e8e800427 Warning fix: removed needless tautological check 2019-12-12 10:45:30 +01:00
bubnikv
303110a997 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-12 10:42:23 +01:00
Lukas Matena
efb1f0c121 SLA gizmos fix: clipping of points/holes always used coords from the first instance
Few warnings fixed
2019-12-12 10:40:28 +01:00
YuSanka
68263e298c Updated dictionaries 2019-12-12 08:45:29 +01:00
David Kocik
576b36066a linux eject 2019-12-11 18:30:03 +01:00
David Kocik
f68d7ce811 merge 2019-12-11 17:43:11 +01:00
David Kocik
e819cb1546 eject button functionality 2019-12-11 17:42:56 +01:00
Slic3rPE
1450c92404 macos eject 2019-12-11 17:39:34 +01:00
David Kocik
b41e9fea43 merge 2019-12-11 17:03:30 +01:00
David Kocik
19daba4ff9 eject button functionality 2019-12-11 17:02:12 +01:00
Slic3rPE
66cfbc7a9d macos eject 2019-12-11 16:59:26 +01:00
YuSanka
cf6f69358d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 16:07:51 +01:00
YuSanka
54addb6c51 Fixed wrong context menu selection for instance(s). Related to #3275 2019-12-11 16:07:00 +01:00
Enrico Turri
e3e0f07f37 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 15:30:44 +01:00
Enrico Turri
2c5b1b0e54 Some rework on layout of imgui dialogs 2019-12-11 15:30:25 +01:00
David Kocik
ea788de4b5 eject button functionality 2019-12-11 15:02:20 +01:00
David Kocik
d395e5bccf eject button functionality 2019-12-11 14:53:28 +01:00
tamasmeszaros
4c2b8a9dad Another small fix for FindGLEW 2019-12-11 14:39:31 +01:00
tamasmeszaros
9bd565ad19 Fix CGAL target name 2019-12-11 14:23:12 +01:00
tamasmeszaros
8e5e40c928 Merge branch 'tm_opencsg' 2019-12-11 14:04:04 +01:00
tamasmeszaros
5645cb36f0 Fix zlib on msvc 2019-12-11 14:01:14 +01:00
tamasmeszaros
65e3c8e445 Fix zlib dependencies and CMAKE_MODULE_PATH forwarding 2019-12-11 14:01:07 +01:00
tamasmeszaros
88b14a725f Fix finding static libraries on windows (mingw) 2019-12-11 14:00:55 +01:00
tamasmeszaros
c4d4993f74 Merge branch 'tm_opencsg' 2019-12-11 12:52:03 +01:00
tamasmeszaros
1f623fdae6 Finding GLEW work in release and debug.
Make building in release and debug in one cmake run on msvc with the prusaslicer_add_cmake_project function.
2019-12-11 12:32:29 +01:00
David Kocik
f4c8e90d77 eject button functionality 2019-12-11 12:28:51 +01:00
Slic3rPE
0e94740e08 Merge branch 'dk_remote_devices' of https://github.com/prusa3d/slic3r into dk_remote_devices 2019-12-11 11:01:00 +01:00
Slic3rPE
3583962f9c macos better wrapper 2019-12-11 11:00:47 +01:00
YuSanka
a7ade77d18 Added missed icon 2019-12-11 11:00:23 +01:00
YuSanka
c267e8a6bc GIT_TAG for deps-macos.cmake is changed to "v3.1.3-patched" 2019-12-11 10:32:50 +01:00
Slic3rPE
25c1fba0e0 macos better wrapper 2019-12-11 10:16:32 +01:00
Lukas Matena
e1330fffdc Added a validation check to reject wipe tower in sequential prints
This scenario was never supported (#3283)
2019-12-11 08:12:19 +01:00
bubnikv
1b3ddb2098 Fixed update logic to support newer index downloaded from the internet
than the index stored in the resources.
2019-12-10 17:49:09 +01:00
bubnikv
4f7201a99c Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-10 17:47:24 +01:00
tamasmeszaros
3164623def Merge branch 'tm_cgal' 2019-12-10 17:45:36 +01:00
tamasmeszaros
89023ef06f Add dll copy after targets for gmp and mpfr 2019-12-10 17:42:25 +01:00
YuSanka
0897e79a19 Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices 2019-12-10 17:31:58 +01:00
YuSanka
6317b449b1 Implemented "Disconnect" button 2019-12-10 17:31:27 +01:00
YuSanka
0b09850fdf Fixed show context menu for multiple selection in ObjectList 2019-12-10 17:25:30 +01:00
tamasmeszaros
e01c738bf8 Add dlls into bin rather than lib 2019-12-10 15:49:52 +01:00