Commit Graph

12423 Commits

Author SHA1 Message Date
YuSanka
7e87d093fc Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices 2019-12-13 13:24:12 +01:00
YuSanka
e5fcb587e2 Implemented rescaling for "Remove device" button 2019-12-13 13:23:55 +01:00
David Kocik
8895e944cf comments 2019-12-13 13:04:09 +01:00
Enrico Turri
62e36cd2d5 Fixed filename shown in open file dialog for reload from disk 2019-12-13 12:41:46 +01:00
David Kocik
ff58fa99f4 comments 2019-12-13 11:52:08 +01:00
YuSanka
967da67d2e Fixed disabling for "Set As separated object" context menu item
+ added missed bug fix in get_freq_settings_choice (part of b9899f9496)
2019-12-12 15:54:53 +01:00
David Kocik
e1d9de3ca4 button show after write 2019-12-12 15:43:14 +01:00
David Kocik
95ccc2c4df button show after write 2019-12-12 14:56:30 +01:00
YuSanka
2eb3766e11 Deleted lines to disable dark mode when compiled against the latest OSX SDK 2019-12-12 14:43:13 +01:00
YuSanka
d028f804c4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 13:49:30 +01:00
YuSanka
30f259f79c Fixed a bug (OSX specific) caused a crash on undo after Copy/Past several objects 2019-12-12 13:49:12 +01:00
YuSanka
b9899f9496 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
d90fa5d749 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 13:38:26 +01:00
Enrico Turri
f2b8607d11 Fixed positioning of gizmos' imgui dialogs 2019-12-12 13:38:08 +01:00
Lukas Matena
9805b02a25 Removed an obsolete variable from MeshRaycaster 2019-12-12 13:19:16 +01:00
tamasmeszaros
c26705ddad Try to fix deps build on win32 with forwarding CMAKE_GENERATOR_PLATFORM 2019-12-12 13:09:57 +01:00
bubnikv
792ee1be62 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-12 12:11:37 +01:00
Lukas Matena
537260494d Merge branch 'master' into lm_tm_hollowing 2019-12-12 11:37:33 +01:00
Enrico Turri
03fee19fef Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 11:11:20 +01:00
Enrico Turri
d6f5ed9ad0 Refactoring in GLGizmosManager to simplify code 2019-12-12 11:11:11 +01:00
David Kocik
0cb9a4c542 eject button after export 2019-12-12 10:48:33 +01:00
Lukas Matena
c284a65caa Warning fix: removed needless tautological check 2019-12-12 10:45:30 +01:00
bubnikv
77d3aba1aa Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-12 10:42:23 +01:00
Lukas Matena
135660decf 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
0e157b5b07 Updated dictionaries 2019-12-12 08:45:29 +01:00
David Kocik
59fa78373b linux eject 2019-12-11 18:30:03 +01:00
David Kocik
c6b5253bce merge 2019-12-11 17:43:11 +01:00
David Kocik
e2048775f6 eject button functionality 2019-12-11 17:42:56 +01:00
Slic3rPE
a03ce255d6 macos eject 2019-12-11 17:39:34 +01:00
David Kocik
7602cde289 merge 2019-12-11 17:03:30 +01:00
David Kocik
f057077826 eject button functionality 2019-12-11 17:02:12 +01:00
Slic3rPE
38c69f16f0 macos eject 2019-12-11 16:59:26 +01:00
YuSanka
43d5437e1f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 16:07:51 +01:00
YuSanka
d66761e030 Fixed wrong context menu selection for instance(s). Related to #3275 2019-12-11 16:07:00 +01:00
Enrico Turri
2744e71967 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 15:30:44 +01:00
Enrico Turri
57d069bd0a Some rework on layout of imgui dialogs 2019-12-11 15:30:25 +01:00
David Kocik
6dddc1cc6b eject button functionality 2019-12-11 15:02:20 +01:00
David Kocik
4a7f50ad66 eject button functionality 2019-12-11 14:53:28 +01:00
tamasmeszaros
658858b249 Another small fix for FindGLEW 2019-12-11 14:39:31 +01:00
tamasmeszaros
4a931c037a Fix CGAL target name 2019-12-11 14:23:12 +01:00
tamasmeszaros
e2bea1ed17 Merge branch 'tm_opencsg' 2019-12-11 14:04:04 +01:00
tamasmeszaros
4282c57069 Fix zlib on msvc 2019-12-11 14:01:14 +01:00
tamasmeszaros
4a4d8b4e26 Fix zlib dependencies and CMAKE_MODULE_PATH forwarding 2019-12-11 14:01:07 +01:00
tamasmeszaros
c91046925a Fix finding static libraries on windows (mingw) 2019-12-11 14:00:55 +01:00
tamasmeszaros
5b67ce5105 Merge branch 'tm_opencsg' 2019-12-11 12:52:03 +01:00
tamasmeszaros
38aa5cb437 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
975642e3e0 eject button functionality 2019-12-11 12:28:51 +01:00
Slic3rPE
6c98231610 Merge branch 'dk_remote_devices' of https://github.com/prusa3d/slic3r into dk_remote_devices 2019-12-11 11:01:00 +01:00
Slic3rPE
bcfc333fb1 macos better wrapper 2019-12-11 11:00:47 +01:00
YuSanka
be09c91a1d Added missed icon 2019-12-11 11:00:23 +01:00