Commit Graph

9145 Commits

Author SHA1 Message Date
Enrico Turri
8ef05df59f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-12 10:50:42 +02:00
tamasmeszaros
dcd66f00e6 Fix for issue SPE-901 2019-04-12 10:26:33 +02:00
Enrico Turri
d062297e4d Copy and paste -> Fixed tooltips for copy and paste toolbar items on Mac 2019-04-12 08:57:53 +02:00
Enrico Turri
3f427366e1 Copy and paste -> Disabled paste of instances when selection is in Volume mode 2019-04-12 08:49:24 +02:00
Enrico Turri
1f6d671abb Fixed conflicts after merge with master 2019-04-12 08:41:59 +02:00
tamasmeszaros
3585c56edf Material correction XY merged 2019-04-11 17:07:41 +02:00
Enrico Turri
6c12939201 New icons for copy and paste toolbar items 2019-04-11 15:51:12 +02:00
bubnikv
0bcbdcdc5c Merge branch 'lm_sla_gizmo_clipping_plane' 2019-04-11 15:45:49 +02:00
bubnikv
780edaab8d Setting the SLA Pad wall height to zero and adding a warning to not set
it to non zero, as it may be difficult to tear the object off the vat foil.
2019-04-11 15:45:14 +02:00
bubnikv
8ad52f0461 Vojtech's improvements in the SLA preview cutting dialog. 2019-04-11 15:44:32 +02:00
Enrico Turri
415f66144e Copy and paste -> Disabled paste of volumes when nothing is selected and fixed enabling/disabling of paste item in toolbar and edit menu 2019-04-11 14:21:08 +02:00
Enrico Turri
61ef36805f Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri
0466d83f78 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-11 12:57:16 +02:00
Enrico Turri
f498e43608 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-11 12:56:37 +02:00
Enrico Turri
52cb8bdd09 Removed old png icons for gizmos 2019-04-11 12:55:56 +02:00
Enrico Turri
00f92ec2e8 Copy and paste -> Added offset to pasted objects/volumes 2019-04-11 11:27:15 +02:00
Enrico Turri
d276653a97 Copy and paste -> Fixed copy of multiple instances and volumes insertion into objects list 2019-04-11 11:09:32 +02:00
Enrico Turri
fd4ddf56e7 Render selected objects first 2019-04-11 08:36:00 +02:00
Enrico Turri
1c429e3686 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 15:55:52 +02:00
Enrico Turri
81a5b161c1 Copy and paste -> prototype of copy and paste for objects 2019-04-10 15:55:32 +02:00
Lukas Matena
a6fff9dd2d SLA gizmo fix: Discarding manual edits on autogenerated points removed all the points from the gizmo cache 2019-04-10 15:27:44 +02:00
Enrico Turri
9a5176b4cf Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 14:03:57 +02:00
Enrico Turri
3450691d45 Copy and paste -> Clipboard refactored to accept more than one object 2019-04-10 14:03:40 +02:00
Enrico Turri
82d9ee4392 Fixed crash when typing on keyboard during the app start-up 2019-04-10 13:52:18 +02:00
Lukas Matena
ba1bfa9e66 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
bubnikv
a5b2c7482f Changed the scene update on RELOAD_SLA_SUPPORT_POINTS
to delay the loading if some transformation gizmo is in action.
2019-04-10 13:36:15 +02:00
Lukas Matena
87a049c577 SLA gizmo fix: recalculation of the mesh was sometimes skipped 2019-04-10 13:33:58 +02:00
Enrico Turri
db18c6b2b2 Do not show as hovered the entire instance when hovering on modifiers 2019-04-10 12:20:07 +02:00
Enrico Turri
e28ff01bab Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 12:17:13 +02:00
Enrico Turri
3ef96e17ba Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-10 12:16:33 +02:00
Enrico Turri
dd2dd8aeec Do not activate Delete command when the wipe tower is selected 2019-04-10 12:16:17 +02:00
Vojtech Kral
cde0b9d01c Update SL1 icon 2019-04-10 12:11:47 +02:00
Enrico Turri
44b450633f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 11:20:28 +02:00
Enrico Turri
fccab8e195 Render picking pass renders volumes in the same order as the regular render pass 2019-04-10 11:20:09 +02:00
bubnikv
2740c1eeb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-10 10:16:12 +02:00
bubnikv
27c9c15222 Fixed Cmd-A selection in the SLA gizmo. 2019-04-10 10:16:04 +02:00
Enrico Turri
c2b71a15d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:52:59 +02:00
Enrico Turri
a43a57f138 Fixed icon layers.svg (again) 2019-04-10 09:52:21 +02:00
Enrico Turri
d2c1deb778 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:46:24 +02:00
YuSanka
9862d8c92d Added new icons 2019-04-10 09:41:04 +02:00
Enrico Turri
6d5d74c0cb Copy and paste -> Copy a volume from an object and paste to another 2019-04-10 09:27:42 +02:00
Enrico Turri
8bd3c6ec5c 1st installment of copy and paste -> prototype for volumes copy and paste 2019-04-10 08:40:58 +02:00
tamasmeszaros
e4ec57cf60 Removing separate X and Y relative correction. 2019-04-09 18:15:25 +02:00
Vojtech Kral
b9bc1de492 Bitmaps: Pass wxWindow context in a few more places 2019-04-09 18:01:45 +02:00
Vojtech Kral
476672adf6 Bitmaps: Fix: Use scaling factor on Mac only 2019-04-09 18:01:45 +02:00
bubnikv
fd5107136c Switching to the preview screen when the "Slice now" button is pressed.
Let's wait for the response of the beta testers whether it is a good
idea.
2019-04-09 17:15:14 +02:00
YuSanka
7793fea7c8 Localization: Updated dictionaries 2019-04-09 16:54:31 +02:00
Enrico Turri
6eec9230d4 Follow-up to af05e5fc2c -> added missing #else 2019-04-09 15:43:16 +02:00
Enrico Turri
952bbf4259 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
Vojtech Kral
c815c9242a Factor out load_scaled_bitmap 2019-04-09 15:16:10 +02:00