Commit Graph

1936 Commits

Author SHA1 Message Date
bubnikv
0d997447b4 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-06 18:28:37 +02:00
bubnikv
c9cd4818c7 Improvements of High DPI scaling on Windows. 2019-05-06 18:28:23 +02:00
Vojtech Kral
658e9c2b1b Refactor language switch, infer user's language on fresh startup 2019-05-06 11:58:06 +02:00
Vojtech Kral
ba297a929a Prompt language selection on fresh startup 2019-05-06 11:51:08 +02:00
Enrico Turri
69f81120e0 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-06 08:22:37 +02:00
Lukas Matena
e9a53e49db Arrange is accounting for the wipe tower now 2019-05-06 08:14:45 +02:00
Lukas Matena
5f226c5d7f Allow wipe tower rotation by the rotation gizmo 2019-05-06 08:14:45 +02:00
bubnikv
045879f68a Fix of a crash when deleting an object while it is edited
with the smooth variable layer editing tool.
2019-05-04 21:40:58 +02:00
bubnikv
31e724abac Merge branch 'master' into vb_wold_object_manipulation 2019-05-04 20:59:57 +02:00
YuSanka
8e007c5b6a Localization improvements 2019-05-04 02:07:07 +02:00
bubnikv
a8241ad7f7 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-05-03 19:13:47 +02:00
bubnikv
09d80b1b2a Added ConfigDef::get_default_value<>() template,
refactored calling code to use it.
2019-05-03 18:30:58 +02:00
bubnikv
a61e833536 Implemented the "Support for support enforcers only" quick selection.
Reduced some memory leaks due to the ConfigDef::default_value pointer.
2019-05-03 18:01:39 +02:00
YuSanka
30dc689d35 Added set_as_owner_drawn() for the code universality 2019-05-03 16:14:26 +02:00
YuSanka
8be585893a Fixed a crash, if try to add second settings grope for instance 2019-05-03 16:05:49 +02:00
Enrico Turri
c62006048f Associate 3mf files on Windows 2019-05-03 15:50:05 +02:00
YuSanka
b4dbd55623 Merge remote-tracking branch 'origin/ys_ftn_improvements' 2019-05-03 14:31:59 +02:00
YuSanka
80d3cbac73 Temporary fix for crash, if try to add second settings grope for instance 2019-05-03 14:29:28 +02:00
YuSanka
4be4dc623c Fixed full statistics calculation
(calculate sum of volume and part_count only for solid parts)
2019-05-03 13:09:42 +02:00
bubnikv
1c6006f657 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-05-03 12:37:43 +02:00
bubnikv
0ab96ed6b5 Changed the "non-uniform scaling is not possible" message. 2019-05-03 12:36:26 +02:00
Enrico Turri
d971c821b7 Merge branch 'et_selection_rectangle' of https://github.com/prusa3d/Slic3r 2019-05-03 11:44:37 +02:00
YuSanka
2affa48178 Menu icons drawing under OSX (if wxMenu::SetOwnerDrawn() is implemented in wxWidgets) 2019-05-03 09:44:19 +02:00
Enrico Turri
47f27d20f1 Added confirmation dialog for Delete All command 2019-05-02 13:52:13 +02:00
Enrico Turri
a3385278e5 Export to STL of SLA supports and pad 2019-05-02 13:46:39 +02:00
YuSanka
88c9948c85 Fixed typo 2019-05-02 09:54:18 +02:00
YuSanka
b048669a3b Changed update_warning_icon_state() signature
(next try to fix OSX compilation)
2019-05-02 08:33:38 +02:00
bubnikv
f2bb070ab9 Implemented scaling of instances through the object manipulation box
for rotated, but still axis aligned coordinate systems.
2019-05-01 11:33:41 +02:00
YuSanka
7f37f82ad4 Added comments 2019-04-30 16:59:40 +02:00
YuSanka
11a04f918b ObjectList: Show tooltip for warning icon only instead of whole "Name" cell 2019-04-30 15:46:25 +02:00
Enrico Turri
4a5992ba6e Top toolbar use layers_white.svg icon for layers editing 2019-04-30 15:43:19 +02:00
YuSanka
4f7398bbef Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-30 15:19:08 +02:00
YuSanka
f18ebec8e9 Added menu icons for a dark mode 2019-04-30 15:14:18 +02:00
Enrico Turri
3a5485a179 Flip X mouse deltas if bed is upside down (when camera up vector has negative Z) 2019-04-30 15:09:25 +02:00
YuSanka
646986348a Fixed menubar item's name in respect to printer_technology 2019-04-30 13:52:05 +02:00
YuSanka
3bc6c29b7a Added missed include 2019-04-30 11:27:41 +02:00
YuSanka
3eacb0a216 Next try 2019-04-30 09:38:23 +02:00
YuSanka
6ddefc6a65 Some refactoring to fix OSX build 2019-04-30 09:11:57 +02:00
bubnikv
5084d544a2 Fixed a bug, where std::string and wxString were mixed up. 2019-04-29 18:10:08 +02:00
bubnikv
ebb7981d16 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-04-29 17:39:28 +02:00
bubnikv
a591bb0f15 Missing forward declaration 2019-04-29 17:24:05 +02:00
Vojtech Kral
8098c09589 MainFrame: Maximize by default (at first start) 2019-04-29 16:57:08 +02:00
bubnikv
6921a04077 Trying to bind the common accelerators on the object list. 2019-04-29 16:02:39 +02:00
bubnikv
e5c97364a4 Fix of anisotropic scaling from the 3D scene. 2019-04-29 16:01:52 +02:00
YuSanka
88fc45797c Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-29 15:30:01 +02:00
YuSanka
2a47f0dc92 ObjectList improvements: Added warning icon for Parts with a repaired errors 2019-04-29 15:27:59 +02:00
Lukas Matena
3ec17fae67 A hotfix for #2179 (GCode preview crash on T-1 in GCode) 2019-04-29 14:26:46 +02:00
Vojtech Kral
9d67804d10 ConfigWizard: Finish DPI resizing (MSW) 2019-04-29 12:22:44 +02:00
Vojtech Kral
b158598393 Detect dank mode on Mac OS 2019-04-29 11:36:01 +02:00
Vojtech Kral
fb0836b0b2 ConfigWizard: Select an appropriate printer based on the bundle order 2019-04-29 11:36:00 +02:00
Enrico Turri
2a741bf8f8 Rectangle selection -> Lighter color for deselect hover 2019-04-29 10:01:28 +02:00
Enrico Turri
a4bd98070e Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-29 10:01:01 +02:00
YuSanka
c8815041e2 Fix of #2168 2019-04-29 09:43:42 +02:00
Enrico Turri
6ec9d6ba3f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-29 09:02:50 +02:00
Enrico Turri
2c9e3819c1 Darker colors for axes arrows, transformation visual hints and gizmo grabbers 2019-04-29 09:02:04 +02:00
Enrico Turri
dfe2719656 Rectangle selection -> Min size of rectangle selection set to 1 pixel 2019-04-29 08:31:32 +02:00
Enrico Turri
fdf1b8af81 Rectangle selection -> Removed cursor change 2019-04-29 08:26:08 +02:00
bubnikv
16560f6e27 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-04-26 17:42:51 +02:00
bubnikv
6526a8fcaf WIP: Transformation of instances in world coordinate space:
Ulocking the "anisotropic" scaling checkbox will bake the transformation
into meshes to allow for scaling in world axes.

Optimized and templated the stl_transform functions, now also available for 3x3 matrices.
The Canvas3D::reload_scene() now maintains selection even if all volumes of an instance changed their IDs.
2019-04-26 17:28:31 +02:00
Enrico Turri
818f7ad647 Rectangle selection in 3D scene -> Fixed selection cleared when mouse left-up follows shift-up 2019-04-26 14:07:46 +02:00
Enrico Turri
6f273bef7f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 13:38:34 +02:00
Enrico Turri
8857d556f6 Rectangle selection in 3D scene -> tweaks to hovering detection and selection update logic 2019-04-26 13:37:34 +02:00
YuSanka
c752394abd Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-26 13:13:59 +02:00
YuSanka
127a78d953 Fixed default font for legends in respect to the OS 2019-04-26 13:08:25 +02:00
YuSanka
046466164f OSX: Forced set the input value for SpinControl,
since the value inserted from the clipboard is not updated
2019-04-26 13:08:25 +02:00
YuSanka
6373ee2b85 Rescale under MSW : fixed rendering of MainFrame, if it was maximized during moving 2019-04-26 13:08:25 +02:00
Enrico Turri
92aab039d2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 12:41:32 +02:00
YuSanka
023ca6fbe6 ConfigSnapshotDialog: Fix app name interpolation 2019-04-26 11:05:00 +02:00
YuSanka
7560de0704 Fixed app name interpolation for : GUI_App, MainFrame, MsgDialog, Preferences, Tab and UpdateDialogs
+ added edit_tooltip(), wich replaces Slic3r for SLIC3R_APP_KEY
2019-04-26 10:54:18 +02:00
Enrico Turri
07d8fe6f11 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 08:03:10 +02:00
YuSanka
545d9df3c0 Added missed class declaration under OSX 2019-04-25 16:23:50 +02:00
YuSanka
3d48190616 After merge fixing 2019-04-25 16:19:50 +02:00
YuSanka
ee0f804d08 Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-25 16:06:19 +02:00
YuSanka
708037158e Added msw_buttons_rescale() - Function for a scaling Dialog's buttons under MSW 2019-04-25 15:09:12 +02:00
Enrico Turri
36252a42da Small optimization 2019-04-25 15:08:14 +02:00
Enrico Turri
905673f344 Small refactoring 2019-04-25 13:41:00 +02:00
Enrico Turri
748a4438ba Attempt to fix build on Linux 2019-04-25 13:35:24 +02:00
Enrico Turri
a0640d2d24 Rectangle selection in 3D scene -> selection update 2019-04-25 12:31:55 +02:00
Enrico Turri
16ef4731e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-25 11:51:23 +02:00
Enrico Turri
3fba850793 Rectangle selection in 3D scene -> tweaks to the hovering detection logic 2019-04-25 11:50:30 +02:00
Enrico Turri
d2597482e0 Added imgui debug dialog for render statistics 2019-04-25 11:10:01 +02:00
Vojtech Kral
3f978f6afe ConfigWizard: Fix app name interpolation 2019-04-25 10:47:15 +02:00
Enrico Turri
d2d06c9f73 Rectangle selection in 3D scene -> refactored GLVolume member varialbe for hovering 2019-04-25 10:21:24 +02:00
Enrico Turri
11490dfb06 Rectangle selection in 3D scene -> hovering detection 2019-04-25 09:46:26 +02:00
bubnikv
f78c3a0f1b WIP, non-uniform scaling in the world coordinate system:
Disable non-uniform scaling when switching to the World coordinate system
and the rotation is not multiples of ninety degrees.
Ask user whether to bake in the transformations into the meshes if
enabling the non-uniform scaling in that case.
2019-04-25 09:24:33 +02:00
Enrico Turri
ec2f319a3d Rectangle selection in 3D scene -> rendering 2019-04-25 09:10:03 +02:00
Enrico Turri
b557336fa6 Fixed conflicts after merge with master 2019-04-25 08:12:48 +02:00
YuSanka
b39e9a81f3 Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-25 08:12:19 +02:00
YuSanka
065448e9e5 Big Refactoring: - deleted/renamed all _Prusa_ prefixes,
- cleaned code from commented parts
 - rescale() -> msw_rescale()
2019-04-25 01:45:00 +02:00
YuSanka
be60f0a53c Merge remote-tracking branch 'origin/ys_msw_dpi' 2019-04-24 23:09:50 +02:00
YuSanka
b856645f3e Merge remote-tracking branch 'origin/ys_bug_fixing' 2019-04-24 22:55:24 +02:00
bubnikv
2cc7b00a7d WIP: World / local transformations of an object instance from the side panel. 2019-04-24 19:03:05 +02:00
Enrico Turri
8b77a4c717 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-24 16:08:08 +02:00
YuSanka
b4d5287d0c Refactoring: get_mesh_errors_count() moved to ModelObject
+ added get_object_stl_stats() to ModelObject
2019-04-24 16:04:47 +02:00
Vojtech Kral
98c8cef657 ConfigWizard: Don't blow up if a printer bitmap is missing 2019-04-24 16:03:32 +02:00
Vojtech Kral
cfa7802a8a ConfigWizard: Attempt to fix width hint 2019-04-24 16:03:32 +02:00
Vojtech Kral
5fd2e573a0 GUI_App: Add a language code getter 2019-04-24 16:03:32 +02:00
Enrico Turri
9d070410c2 Refactoring of GLSelectionRectangle 2019-04-24 16:01:27 +02:00
Enrico Turri
d79a2b8d2d GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection 2019-04-24 15:43:52 +02:00
Enrico Turri
9710140948 int GLCanvas3D::m_hover_volume_id replaced with std::vector<int> GLCanvas3D::m_hover_volume_idxs 2019-04-24 15:07:28 +02:00
Enrico Turri
fc67f44bea Fixed typo 2019-04-24 13:43:39 +02:00
YuSanka
356e1207d6 Merge remote-tracking branch 'origin/master' into ys_ftn_improvements 2019-04-24 13:38:07 +02:00
YuSanka
203e9e848c Changed Manipulation panel. (Simple mode)There is exclamation mark icon next for the object name, if it has errors.
+ some code refactoring
2019-04-24 13:33:05 +02:00
Lukas Matena
ae692635da Selection rectangle moved into a separate class 2019-04-24 13:25:41 +02:00
bubnikv
5d2537af35 WIP: Transformations of an instance in world coordinate system
from the side panel.
2019-04-24 11:01:59 +02:00
Lukas Matena
7185125f9c Fixed out-of-bouds access in RammingChart.cpp in case the ramming was turned off 2019-04-24 10:12:23 +02:00
YuSanka
aa147482b7 Added _fiction_ resizing for correct MainFrame rendering after DPI changed_object
+ Added a calculation of a empty bitmaps inside presets in respect to em_unit (to avoid assert)
 + Added scaling for PrintHostDialogs and MsgDialog
 + some code refactoring
2019-04-23 16:33:06 +02:00
Vojtech Bubnik
31d377d09f Some refactoring and documentation, modified Windows dependencies to compile against patched wxWidgets 2019-04-23 12:35:26 +02:00
YuSanka
31c02b6bfb Added missing includes 2019-04-23 08:47:23 +02:00
YuSanka
1f02eb704a Code refactoring: Deleted unused variables and _cleaned_ overbusy functions 2019-04-22 01:51:10 +02:00
YuSanka
ff3f1c9ee0 Fixed application crash, if try to change Preset in a moment, when one of unregular pages is selected.
+ small code refactoring
2019-04-22 00:46:58 +02:00
YuSanka
4a20fd7f7e Fix of #1216 2019-04-21 23:12:39 +02:00
YuSanka
144b9e1e9d Merge remote-tracking branch 'origin/master' into ys_bug_fixing 2019-04-21 11:37:30 +02:00
bubnikv
5e45cff855 Merge branch 'ys_msw_dpi' of https://github.com/prusa3d/Slic3r into ys_msw_dpi 2019-04-18 17:16:42 +02:00
bubnikv
e7d6586220 Another missing include 2019-04-18 17:16:31 +02:00
Lukas Matena
55c07394e5 Added dialog with shortcuts to the SLA gizmo, tried to improve the dialog look 2019-04-18 15:46:35 +02:00
YuSanka
b5533017fb Merge branch 'ys_msw_dpi' of https://github.com/prusa3d/Slic3r into ys_msw_dpi 2019-04-18 15:36:48 +02:00
YuSanka
5761c8f126 Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-18 15:33:50 +02:00
YuSanka
de55801e31 Merge remote-tracking branch 'origin/ys_bug_fixing' into ys_msw_dpi 2019-04-18 15:24:50 +02:00
bubnikv
08b01338a8 Fixed missing header (clang is picky) 2019-04-18 15:22:58 +02:00
YuSanka
9cd3c594be Overrided on_dpi_changed() for some Dialogs:
AboutDialog, ConfigSnapshotDialog, FirmwareDialog, SysInfoDialog

+ set correct fonts for KBShortcutsDialog
2019-04-18 15:05:17 +02:00
YuSanka
e97e8c6af6 Overrided on_dpi_changed() for some Dialogs:
BedShapeDialog, KBShortcutsDialog, ConfigWizard, Preferences
2019-04-18 02:03:40 +02:00
YuSanka
077321b228 Implemented em_unit() function for getting of em_unit value from correct parent.
+ Added correct em_unit to Fields
2019-04-17 21:35:53 +02:00
Vojtech Kral
eae6576162 Fix default bitmap loading in Field 2019-04-17 17:31:00 +02:00
Vojtech Kral
79e71cb8d3 ConfigWizard: Fix index width 2019-04-17 16:48:01 +02:00
Vojtech Kral
b57452d090 Fix a bunch of race conditions between arrange and bg processing, fix #1770 2019-04-17 15:40:58 +02:00
Lukas Matena
0c1e223414 SLA gizmo clipping plane is now not necessarily perpendicular to camera direction 2019-04-17 14:27:20 +02:00
Lukas Matena
8df2a19974 SLA clipping plane can now be controlled by Ctrl + mouse wheel rotation 2019-04-17 14:27:20 +02:00
Vojtech Kral
00ed0de815 Fix a format string in UpdateDialogs.cpp 2019-04-17 14:26:07 +02:00
YuSanka
3e9c0c396e Code refactoring 2019-04-17 12:49:10 +02:00
Enrico Turri
50516e3b7d Attempt to fix Ctrl+C from 3D scene on Mac 2019-04-17 10:27:33 +02:00
Lukas Matena
19759b4315 SLA gizmo clipping - changed color on the cuts of supports, turned their rendering in editing mode (when the supports are not shown) 2019-04-17 09:39:51 +02:00
YuSanka
3b9803ba6e Fixed crash of build under OSX and Linux.
+ Added flag to control if application rescale is possible
2019-04-16 17:06:28 +02:00
YuSanka
850eb86360 Merge remote-tracking branch 'origin/master' into ys_bug_fixing 2019-04-16 15:27:10 +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
YuSanka
fc63a28481 Application Scaling for MSW:
+ Experiments with toolBars scaling
+ Rescaled warning and printing legends
2019-04-16 12:13:45 +02:00
Vojtech Kral
554176b97f Http: Fix redirecting of post requests, fix #2018 2019-04-16 12:09:51 +02:00
YuSanka
ae2c61160f Application Scaling for MSW: Added rescale function for DoubleSlider (from Preview), ObjectList, ManipulationPanel and SettingsPanel
+ Set wider default size for Preset Comboboxes from Tabs (#2023)
2019-04-16 10:05:45 +02:00
Lukas Matena
63ce3c3150 SLA gizmo now does not make redundant copies of the object and supports meshes 2019-04-16 09:04:04 +02:00
Lukas Matena
f33e9bf609 TriangleMeshSlicer is now initialized by const-pointer to the mesh, responsibility for calling require_shared_vertices is left to the caller 2019-04-16 09:04:04 +02:00
Lukas Matena
a177a7e1da SLA gizmo clipping now also triangulates the cuts on support structure 2019-04-16 09:04:04 +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
bubnikv
95a0adbac9 More unification of the application naming. 2019-04-15 19:49:37 +02:00
bubnikv
496922036f Harmonized the application naming. 2019-04-15 16:14:19 +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
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
YuSanka
e502b33f41 Post-merge fix 2019-04-14 13:57:15 +02:00
YuSanka
df7ada0199 Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-14 13:49:22 +02:00
YuSanka
66fa280964 Some code refactoring 2019-04-14 10:57:03 +02:00
bubnikv
e4162bbee9 When loading a 3MF with advanced data, switch to an Advanced mode, not
Export moe.
2019-04-14 08:26:10 +02:00
YuSanka
f7ddddcff5 Application Scaling for MSW: Next big step
- Added rescale() function for the most of controls
 - Created PrusaBitmap and PrusaButton classes like a wrap to wxBitmap and wxButton accordingly
2019-04-13 23:46:52 +02:00
bubnikv
255a4e05dc Fix of "Repir from File menu doesn't save the file #2064"
The file was saved, albeit using an "obj" format, but into a file
with an ".stl" extension.
The software was fixed to propose a file to save with a correct ".obj"
extension.
2019-04-13 14:45:35 +02:00
bubnikv
1e455bc065 Fix of "Variable layer height feature breaks after rotating part #2073"
There was an approximate bounding box used at the GUI, while a snug
bounding box was used at the back end, causing invalidation
of the variable layer height editing profile on rotated objects.

A snug bounding box around the first instance is now cached.
2019-04-13 14:15:54 +02:00
bubnikv
b0c33a1fe9 Fixed copying of some object's attributes into the clipboard
(layer height profile, layer height table etc)
Added public Plater::schedule_background_process()
2019-04-12 18:29:47 +02:00
YuSanka
cfa4f3f4d6 Added new icons 2019-04-12 17:10:29 +02:00
bubnikv
80afb6da78 Fixed SLA clippling plane & picking. 2019-04-12 16:08: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
Lukas Matena
4abcf7bec4 SLA gizmo dialog height increased so the new clipping plane slider fits 2019-04-12 14:25:41 +02:00
Enrico Turri
e0545852f5 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 13:03:08 +02:00
bubnikv
cef2fa3505 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 12:58:00 +02:00
bubnikv
33ef1173a7 Moved the GLEW dependencies from libslic3r to the gui slic3r library. 2019-04-12 12:57:45 +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
YuSanka
3a412a3a82 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-12 12:28:36 +02:00
YuSanka
50f8f45e0a Added new icons 2019-04-12 12:15:56 +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
Vojtech Kral
5522ed9574 Also revert high DPI bitmaps in ObjectList for now 2019-04-12 11:28:07 +02:00
Vojtech Kral
2fe63e0b04 Revert high DPI bitmaps in Preset and PresetBundle for now
due to bugs in wxBitmapComboBox et al.
2019-04-12 11:04: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
tamasmeszaros
59758fea55 Material correction XY merged 2019-04-11 17:07:41 +02:00
bubnikv
112f218c03 Merge branch 'lm_sla_gizmo_clipping_plane' 2019-04-11 15:45:49 +02:00
bubnikv
4a210aeecf Vojtech's improvements in the SLA preview cutting dialog. 2019-04-11 15:44:32 +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
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
Lukas Matena
096d23f971 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
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
Lukas Matena
678c513cb9 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
bubnikv
9fd8461592 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
e6439ad010 SLA gizmo fix: recalculation of the mesh was sometimes skipped 2019-04-10 13:33:58 +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
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