iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-14 14:48:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,288 Commits 4 Branches 1 Tag
e3b5885a3cff2cf674d1c529f35064c11c7623e9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrico Turri e3b5885a3c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-26 13:39:52 +02:00
Enrico Turri 18db983900 Synch with branch et_selection_rectangle 2019-04-26 13:39:33 +02:00
Enrico Turri c850fb434b Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-26 12:41:56 +02:00
Enrico Turri 661222dab8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-26 08:03:26 +02:00
Enrico Turri 2c077a6b18 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-25 11:51:54 +02:00
Enrico Turri 5cfa164776 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-25 09:58:41 +02:00
Enrico Turri 771ab50466 Fixed conflicts after merge with master 2019-04-25 08:09:22 +02:00
Enrico Turri 06fa70147c Code cleanup 2019-04-25 08:06:07 +02:00
Enrico Turri e3f396a14f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-24 16:07:35 +02:00
Enrico Turri 49dff105bd Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-24 08:17:33 +02:00
Enrico Turri 8ace8f4294 Picking using rectangle selection WIP 4 -> Prototype for selection update 2019-04-23 15:08:18 +02:00
Enrico Turri a6ba6865bb Picking using rectangle selection WIP 3 -> Use parallel_for to extract data from the framebuffer copy 2019-04-23 12:07:35 +02:00
Enrico Turri 43ad9ff8b7 Picking using rectangle selection WIP 2 2019-04-23 10:45:41 +02:00
Enrico Turri 705f7c8fa0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-23 08:03:54 +02:00
Enrico Turri 3fea03f885 Picking using rectangle selection WIP 2019-04-18 15:59:12 +02:00
Enrico Turri 1ffc6b5e64 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-18 13:35:59 +02:00
Enrico Turri 4e01b22a3f Use new class GLSelectionRectangle (refactored) also in 3D scene 2019-04-18 13:35:39 +02:00
Enrico Turri 9e43193b86 1st installment of selection rectangle in 3D scene 2019-04-18 10:05:18 +02:00
Enrico Turri cc0d79755a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-18 08:07:57 +02:00
Enrico Turri e7dcb9d93a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-17 14:48:52 +02:00
Enrico Turri 50516e3b7d Attempt to fix Ctrl+C from 3D scene on Mac 2019-04-17 10:27:33 +02:00
Enrico Turri 5ae6f3158a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-17 08:11:57 +02:00
Enrico Turri 81abb58d49 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-16 13:56:03 +02:00
Enrico Turri 25bfebfe8e Fixed typo in shortcuts dialog 2019-04-16 13:53:57 +02:00
Enrico Turri dfa924e8eb Ctrl+C and Ctrl+V for Copy and Paste refactored in the same way as Ctrl+A for Select All 2019-04-16 13:47:37 +02:00
Enrico Turri c4978817f3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-16 10:11:40 +02:00
Enrico Turri 9b79617eb6 Added debug imgui dialog for render statistics 2019-04-16 10:11:17 +02:00
Enrico Turri e8c08d8f91 Switch to regular shading when manipulating an object with gizmos while layers editing is active 2019-04-16 08:50:46 +02:00
Enrico Turri 8235ad2b02 ObjectList::paste_objects_into_list() refactored to call front end / back end synchronization and scene refresh only once 2019-04-15 15:40:40 +02:00
Enrico Turri d8f28bc31a Follow-up of 1fbdf7bdaa -> Fixed grabbers size for move gizmo and grabbers dragging size 2019-04-15 15:05:26 +02:00
Enrico Turri 00a7673a2b Fixed glitches in rendering when activating layers editing 2019-04-15 14:19:18 +02:00
Enrico Turri 703f65c7bf Fix of #1380 - Wrong estimated time when using extruder absolute coordinates 2019-04-15 12:54:57 +02:00
Enrico Turri dddea0db22 Fixed selection when right-clicking in the 3D scene to show the context menu 2019-04-15 10:27:40 +02:00
Enrico Turri 07d1d44d8c Switch to Advanced mode if object or volumes imported from 3mf and amf files contain advanced config data 2019-04-15 09:22:11 +02:00
Enrico Turri f244a643ee Fixed again layers.svg icon 2019-04-15 08:36:44 +02:00
Enrico Turri 95eb98a103 Darker icons for 3D and preview menu items 2019-04-12 15:47:40 +02:00
Enrico Turri 7d15ee8fd9 Offset used to place newly added volumes and instances proportional to the bed max size 2019-04-12 15:31:33 +02:00
Enrico Turri c8b467bf9f Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 14:30:38 +02:00
Enrico Turri e1debd3a4c Added icons for 3D and preview menu items 2019-04-12 14:30:28 +02:00
Enrico Turri e0545852f5 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 13:03:08 +02:00
Enrico Turri c5fa804c33 Merge branch 'et_copy_and_paste' of https://github.com/prusa3d/Slic3r 2019-04-12 12:40:25 +02:00
Enrico Turri edab2a056e Added icons for Edit menu items: Delete selected, Delete all, Copy, Paste 2019-04-12 11:50:14 +02:00
Enrico Turri 341e5276db Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-12 11:28:43 +02:00
Enrico Turri defcd26b4a Copy and paste -> Fixed paste for multivolumes copies 2019-04-12 11:28:24 +02:00
Enrico Turri 5875582edb Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-12 10:50:42 +02:00
Enrico Turri 5a1b9cd382 Copy and paste -> Fixed tooltips for copy and paste toolbar items on Mac 2019-04-12 08:57:53 +02:00
Enrico Turri 6ff12111a6 Copy and paste -> Disabled paste of instances when selection is in Volume mode 2019-04-12 08:49:24 +02:00
Enrico Turri 3e902ecfbd Fixed conflicts after merge with master 2019-04-12 08:41:59 +02:00
Enrico Turri a8fd1ceca0 New icons for copy and paste toolbar items 2019-04-11 15:51:12 +02:00
Enrico Turri 4046d517c9 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 4718c839f6 Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri d5d0b4244a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-11 12:57:16 +02:00
Enrico Turri 9d2edf31ee Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-11 12:56:37 +02:00
Enrico Turri 3b8ac62a9e Removed old png icons for gizmos 2019-04-11 12:55:56 +02:00
Enrico Turri bd2ac8f1f8 Copy and paste -> Added offset to pasted objects/volumes 2019-04-11 11:27:15 +02:00
Enrico Turri 99993170eb Copy and paste -> Fixed copy of multiple instances and volumes insertion into objects list 2019-04-11 11:09:32 +02:00
Enrico Turri 4987e5a7d5 Render selected objects first 2019-04-11 08:36:00 +02:00
Enrico Turri b98659a749 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 15:55:52 +02:00
Enrico Turri 8b9568797a Copy and paste -> prototype of copy and paste for objects 2019-04-10 15:55:32 +02:00
Enrico Turri 1b6bf30e76 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 14:03:57 +02:00
Enrico Turri 7a1fab09d4 Copy and paste -> Clipboard refactored to accept more than one object 2019-04-10 14:03:40 +02:00
Enrico Turri 2dc88ab0be Fixed crash when typing on keyboard during the app start-up 2019-04-10 13:52:18 +02:00
Enrico Turri a80978f84a Do not show as hovered the entire instance when hovering on modifiers 2019-04-10 12:20:07 +02:00
Enrico Turri 43b51c338e Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 12:17:13 +02:00
Enrico Turri bce98984a1 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-10 12:16:33 +02:00
Enrico Turri 356637a627 Do not activate Delete command when the wipe tower is selected 2019-04-10 12:16:17 +02:00
Enrico Turri 6043dbd07d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 11:20:28 +02:00
Enrico Turri e61be7d260 Render picking pass renders volumes in the same order as the regular render pass 2019-04-10 11:20:09 +02:00
Enrico Turri ffde525100 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:52:59 +02:00
Enrico Turri 4866642c5c Fixed icon layers.svg (again) 2019-04-10 09:52:21 +02:00
Enrico Turri 50fc406fe2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:46:24 +02:00
Enrico Turri 6f6b78d661 Copy and paste -> Copy a volume from an object and paste to another 2019-04-10 09:27:42 +02:00
Enrico Turri 6cbf9d2523 1st installment of copy and paste -> prototype for volumes copy and paste 2019-04-10 08:40:58 +02:00
Enrico Turri 7aa6c1854f Follow-up to af05e5fc2c -> added missing #else 2019-04-09 15:43:16 +02:00
Enrico Turri 0889877e26 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
Enrico Turri 24b8c1fde3 Forced one frame render after selecting single volume in objects list 2019-04-09 11:38:56 +02:00
Enrico Turri a13b2b1de3 Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
Enrico Turri ea3d30bff1 Fix of #2082 -> Added lines M73 P100 and M73 Q100 to gcode to signal that print is finished 2019-04-08 11:54:58 +02:00
Enrico Turri 86cb5bb00d Fixed icon layers.svg 2019-04-08 10:38:48 +02:00
Enrico Turri 09c7eb1d28 Follow-up of a7318dbe19 -> Do not disable other instances when an instance is selected 2019-04-08 09:49:21 +02:00
Enrico Turri a688493d91 Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
Enrico Turri 8cdc461d34 CTRL-click replace SHIFT-click for addind/removing objects to the current selection from the 3D scene 2019-04-08 08:30:28 +02:00
Enrico Turri 6ca49c05df Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
Enrico Turri 233eda2813 Export to stl of instances 2019-04-05 11:30:49 +02:00
Enrico Turri a9223aeb5f Follow-up of 763a91e2ca -> take in account of ModelObject::origin_translation when saving parts and modifiers to stl 2019-04-05 10:08:34 +02:00
Enrico Turri 763a91e2ca Export to stl of parts and modifiers 2019-04-04 15:13:43 +02:00
Enrico Turri 24128e01ed Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 14:00:48 +02:00
Enrico Turri 6197f48321 Use current selection to determine proposed filename when exporting to stl files 2019-04-04 14:00:31 +02:00
Enrico Turri 369cdd8b3b Ask user to switch to expert mode when loading a 3mf or an amf file containing instances or modifiers from simple mode 2019-04-04 12:02:13 +02:00
Enrico Turri c7d6691658 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 11:31:44 +02:00
Enrico Turri 30f44880d7 Removed 'Export print config' checkbox from save dialog for 3mf and amf files 2019-04-04 11:31:26 +02:00
Enrico Turri 936f7a3b84 Select newly added parts/volumes from current selected instance when adding from 3D scene's context menu 2019-04-04 09:35:13 +02:00
Enrico Turri d79b090f7c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-04 09:19:07 +02:00
Enrico Turri c29f7bc147 Fix of #2044 
Added sorting by z of the preview data used to generate the gcode preview because there can be shuffling in case of sequential printing
 2019-04-04 09:16:03 +02:00
Enrico Turri 6d9180ba92 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-04 09:03:25 +02:00
Enrico Turri a7318dbe19 Keeps non selected instances as disabled for any combination of current instance's volumes selection 2019-04-04 09:01:47 +02:00
Enrico Turri 305b07978c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-03 15:28:27 +02:00
Enrico Turri 28ec3415eb Keep instance mode selection when at least one instance is already selected 2019-04-03 15:28:09 +02:00
Enrico Turri 7d488e3424 Added call to schedule_background_process() when deleting modifier attribute 2019-04-03 12:45:06 +02:00
Enrico Turri eff8dd1ae5 Fixed negative values for size shown in the sidebar matrix fields when mirroring is applied 2019-04-03 09:05:52 +02:00