Vojtech Kral
|
b5f1f6ea2f
|
Merge branch 'master' into materials
|
2019-09-30 16:12:48 +02:00 |
|
YuSanka
|
07798b51aa
|
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
|
2019-09-30 14:04:45 +02:00 |
|
YuSanka
|
682b9e0d46
|
Fix of SPE-1035 (Wrong filament color updating for multi-material print)
|
2019-09-30 13:59:26 +02:00 |
|
bubnikv
|
4bfc7f9faa
|
Merge remote-tracking branch 'remotes/origin/et_pull_2922'
|
2019-09-30 10:23:16 +02:00 |
|
Lukas Matena
|
5bf68de25e
|
An attempt to fix #2997
More fixes might be needed on the other platforms
|
2019-09-28 09:57:26 +02:00 |
|
Enrico Turri
|
be6cac24ec
|
Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar
|
2019-09-25 13:05:18 +02:00 |
|
Lukas Matena
|
2fa1094b4e
|
Fixed erroneous use of logical OR where bitwise OR was meant
Also, PrintBase::SlicingStatus enum had two entries assigned to 0 - removed the one that was never used
|
2019-09-25 12:18:30 +02:00 |
|
Enrico Turri
|
daaf6079a7
|
Fixed gizmo scale for objects added to scene using the new context menu
|
2019-09-25 11:25:14 +02:00 |
|
Lukas Matena
|
a34a1341c5
|
Whitespace changes to supress misleading indentation warnings
These appear in newer gcc when spaces and tabs are mixed
|
2019-09-24 16:01:01 +02:00 |
|
YuSanka
|
84756bfc6a
|
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
|
2019-09-24 14:33:20 +02:00 |
|
YuSanka
|
2424b5f267
|
Fix of SPE-1027
|
2019-09-24 14:32:59 +02:00 |
|
Enrico Turri
|
05a3a0627c
|
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
|
2019-09-24 14:13:22 +02:00 |
|
Enrico Turri
|
6c20cef2cf
|
Follow-up of f4910cafed -> Fix extended to Mac
|
2019-09-24 14:13:03 +02:00 |
|
Lukas Matena
|
b9e86d21ec
|
MeshUtils.cpp: MeshRaycaster is now aware of the clipping plane
|
2019-09-24 12:58:12 +02:00 |
|
Enrico Turri
|
cbd6e9f18a
|
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
|
2019-09-24 09:11:43 +02:00 |
|
Enrico Turri
|
9a158663b1
|
#2972 - Fixed selection after adding an instance with autocenter active
|
2019-09-24 09:11:27 +02:00 |
|
YuSanka
|
a127568500
|
Fixed localization for "Configuration Wizard" menu item
|
2019-09-23 16:29:07 +02:00 |
|
Enrico Turri
|
dd503c328f
|
#2922 - Port of commit: f42edd35ce by jschuh
|
2019-09-23 14:56:27 +02:00 |
|
YuSanka
|
96057e2270
|
Added missed comment to 7e060f84bd
|
2019-09-23 14:24:53 +02:00 |
|
YuSanka
|
46960d10aa
|
Fix of #2977
|
2019-09-23 10:17:53 +02:00 |
|
Lukas Matena
|
94a10eb488
|
Fix of https://github.com/prusa3d/PrusaSlicer/issues/2953
printf-like function argument mismatch: num was long, which was obfuscated by the auto keyword
|
2019-09-20 16:47:10 +02:00 |
|
YuSanka
|
d8f2a73d64
|
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
|
2019-09-20 11:30:53 +02:00 |
|
YuSanka
|
5bb32af88e
|
Forcing of explicit SetWidth for the columns under OSX, as an attempt to fix a narrow column width on 4(5)K monitors under OSX
|
2019-09-20 11:30:29 +02:00 |
|
Enrico Turri
|
b9894c36c4
|
Follow-up of 8aaff08355 -> Do not show the new context menu when the user pans the scene + cleanup
|
2019-09-20 11:19:06 +02:00 |
|
YuSanka
|
8704f35348
|
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
|
2019-09-20 09:58:33 +02:00 |
|
YuSanka
|
4e35bf53c7
|
Added Possibility to create "shape" as an independent object from 3dScene,
using right click on empty place
|
2019-09-20 09:57:27 +02:00 |
|
Enrico Turri
|
3796ae0343
|
#2948 - Max zoom takes in account custom bed model size
|
2019-09-20 09:53:35 +02:00 |
|
bubnikv
|
2b28fe85ab
|
Merge branch 'dev' of https://github.com/Prusa3d/PrusaSlicer into dev
|
2019-09-19 17:16:43 +02:00 |
|
bubnikv
|
bb9cb6d793
|
Slic3r -> PrusaSlicer in config snapshot dialog.
|
2019-09-19 17:16:37 +02:00 |
|
YuSanka
|
3ea32d1fac
|
Fix of SPE-1026 (Height range value works differently if you press enter and if you leave textbox)
Related to GH #2946
|
2019-09-19 15:28:36 +02:00 |
|
YuSanka
|
05181c80d9
|
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
|
2019-09-19 14:12:12 +02:00 |
|
YuSanka
|
97c1e90795
|
Fix under OSX for 584b37513f
|
2019-09-19 14:11:56 +02:00 |
|
Enrico Turri
|
b99ac1d7a3
|
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
|
2019-09-19 14:03:05 +02:00 |
|
Enrico Turri
|
df67dbb358
|
Fixed empty filename when trying to export a plate where no object is selected and no object is printable
|
2019-09-19 14:01:17 +02:00 |
|
YuSanka
|
157c5a9c1a
|
Implemented possibility to create "shape" as an object (#2865)
|
2019-09-19 12:30:16 +02:00 |
|
bubnikv
|
d04feb6afe
|
Merge remote-tracking branch 'remotes/origin/dev' into vk-materials
|
2019-09-19 11:49:49 +02:00 |
|
Lukas Matena
|
64f405e55b
|
Plater.cpp - better added a range-check when selecting filament color in purging volumes dialog
|
2019-09-18 12:54:21 +02:00 |
|
Lukas Matena
|
9573fae084
|
Purging volumes dialog now uses filament colour in case extruder color is undefined
|
2019-09-18 11:47:19 +02:00 |
|
Vojtech Kral
|
e346bdae2b
|
Materials: Cleanup
|
2019-09-17 17:16:15 +02:00 |
|
Vojtech Kral
|
92ce446f8e
|
ConfigWizard: Add view mode setting page
|
2019-09-17 15:52:26 +02:00 |
|
Enrico Turri
|
ff9bdaa9fe
|
Fixed typo
|
2019-09-17 15:48:39 +02:00 |
|
Enrico Turri
|
a3096ece13
|
Fixed selection after adding a modifier by loading it from file
|
2019-09-17 15:30:54 +02:00 |
|
Lukas Matena
|
0c3af591dc
|
Merge branch 'lm_raycasting_refactoring' into dev
|
2019-09-17 14:59:14 +02:00 |
|
Lukas Matena
|
f8139337fd
|
SLA gizmo no more uses IGL code directly, all was moved to the new MeshRaycaster class
|
2019-09-17 14:57:57 +02:00 |
|
Lukas Matena
|
9520a432fd
|
MeshRaycaster class is now used in SLA gizmo when selecting by rectangle
|
2019-09-17 14:57:54 +02:00 |
|
Lukas Matena
|
e0b41068ae
|
Added functions get_hit_pos, get_hit_normal, ready to implement intersect_ray
|
2019-09-17 14:57:49 +02:00 |
|
Lukas Matena
|
9776224b06
|
Unproject on mesh in the SLA gizmo is now performed by the MeshRaycaster class
|
2019-09-17 14:57:45 +02:00 |
|
YuSanka
|
cc0b9ced89
|
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
|
2019-09-17 13:42:06 +02:00 |
|
YuSanka
|
4d4b95995e
|
Fixed re-scaling under MSW for Layers editing
+ Clean code in GUI_ObjectManipulation.cpp
|
2019-09-17 13:41:44 +02:00 |
|
Vojtech Kral
|
a56f92b61d
|
WIP: filament/material filtering per selected printers
|
2019-09-17 13:20:06 +02:00 |
|