96e743bc19
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-11 09:01:44 +02:00
cab9a39fcf
Fix of "Bridging and gap fill are parsed incorrectly when infill is set to 0" #1476
...
The gap fill was disabled for zero infill.
Now the gap fill is enabled in between the perimeters, but disabled between
the inner-most perimeter and infill in case the infill is set to zero.
Also in case there are multiple infill regions inside a perimeter,
the mutliple infills are considered as non-zero if at least one infill
is non-zero, therefore the gap fill will be added inside the inner-most
perimeter.
2019-09-10 19:03:37 +02:00
e684f4b4ad
GUI_ObjectList.cpp: Max layer height defaults to 0.75*nozzle_diameter as it should ( #2892 )
2019-09-10 12:34:03 +02:00
5b5f0b925a
Fixed many warnings in following files:
...
src/slic3r/Config/Snapshot.cpp
src/slic3r/GUI/Field.cpp
src/slic3r/GUI/GLToolbar.cpp
src/slic3r/GUI/GUI_ObjectList.cpp
src/slic3r/GUI/GUI_ObjectList.hpp
src/slic3r/GUI/Plater.cpp
src/slic3r/GUI/Plater.hpp
src/slic3r/GUI/PresetBundle.cpp
src/slic3r/GUI/Tab.cpp
src/slic3r/GUI/wxExtensions.cpp
2019-09-10 12:08:43 +02:00
976eb2b893
Fixed instance printable property after reload from disk
2019-09-10 11:16:59 +02:00
2e377cdbe2
Merge remote-tracking branch 'remotes/origin/master' into dev
2019-09-09 17:49:07 +02:00
66eed6c4f9
FirmwareDialog: Attempt to fix window double close assertion #2619
2019-09-09 16:41:14 +02:00
b77ce2db53
Fixed gizmos update after objects loading
2019-09-09 15:55:04 +02:00
f935e217ac
Fixed handling of mouse left up event when moving an object while the place on face gizmo is active
2019-09-09 14:56:55 +02:00
7e573119ff
Fixed rotate gizmo hovering
2019-09-09 12:11:49 +02:00
aceeb11aac
Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-09 08:42:39 +02:00
74f9fbe673
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-09 08:28:16 +02:00
a5e8100a8e
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-06 17:53:17 +02:00
53d6accfa3
Fixed object settings after reload from disk
2019-09-06 17:26:08 +02:00
dcf9c9a1d2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-06 17:25:39 +02:00
9aecca26f4
Fix a few warnings in PrintHostDialogs, UploadDialogs
2019-09-06 16:33:00 +02:00
e840478539
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk
2019-09-06 16:06:37 +02:00
080792f9ed
Fixed some more warnings, moved function to get ExtrusionRole name into ExtrusionEntity.hpp
...
So it can be called from wherever it may be needed
2019-09-06 15:55:07 +02:00
32f79f143b
Fixed several warnings (Config.hpp and few other files)
2019-09-06 15:55:07 +02:00
12ada8caaf
Follow-up of 6c3aae8f89 -> Fixed update of objects list when object has a unique instance
2019-09-06 15:50:54 +02:00
178ffd3fb5
Fix bad pointer dereference in ObjectList::list_manipulation()
...
Fix of #2875
2019-09-06 15:28:58 +02:00
d3914859a3
Fixed update of instances in objects list after reload from disk
2019-09-06 15:10:07 +02:00
2994f64033
Keep correct instance selection after reload from disk
2019-09-06 14:36:47 +02:00
82a2b20afb
Do not render intermediate states while reload from disk action is taking place
2019-09-06 13:49:15 +02:00
77823af964
Keep selection after reload from disk
2019-09-06 13:11:20 +02:00
9d5e872865
DoubleSlider refactoring
2019-09-05 15:31:22 +02:00
b83c783658
Fixed ColorPrint Legend update if Print preset was changed and model was resliced.
2019-09-05 09:13:59 +02:00
ad947cff19
Fixed some more warnings (mostly GLGizmoSlaSupports.cpp)
2019-09-04 16:05:32 +02:00
676f72359b
Merge branch 'master' into dev
2019-09-04 15:50:18 +02:00
e1783d6a00
GUI_ObjectList.cpp: Fixed a crash when deleting instances.
...
Deleting second-but-last instance deletes the whole Instances node, we must select object node in that case.
2019-09-04 15:15:35 +02:00
a27fcf4f51
Fixed debug crash in update_changed_tree_ui
...
Reproduce: For MK2.5S printer preset set flag "Support stealth mode"
2019-09-04 14:37:09 +02:00
36a0f9415f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-04 13:21:13 +02:00
4bf1a162ba
Added DoubleSlider::epsilon() to get a permissible error for layer height
2019-09-04 13:16:44 +02:00
4ae6bfeec0
Updated the bundled Prusa Research profiles.
...
Bumped up the version number to 2.0.0-rc.
Changed the location of profiles from PrusaSlicer-beta to PrusaSlicer
(that is the location for the released software).
2019-09-04 12:50:43 +02:00
b2bc12c758
Fixed layer Z rounding for ticks on DoubleSlider
2019-09-04 11:36:26 +02:00
f7f5a38764
Removed another bunch of compile warnings
2019-09-04 10:46:51 +02:00
f61fe06794
Removed a bunch of compile warnings
2019-09-04 09:47:00 +02:00
9662417488
Fixed sidebar layouts for selected "Object" and "Layers" items in ObjectList
2019-09-04 09:24:44 +02:00
5f23ad1016
Fixed an adding of color change tick on last layer
2019-09-04 08:53:21 +02:00
871e965270
Try to fix asserts from wxBitmapCombobox
2019-09-03 15:30:37 +02:00
0a9c1702b4
Fixed couple of warnings in Field.cpp, GUI_App.cpp and OptionsGroup.cpp
2019-09-03 10:59:04 +02:00
1158e11f79
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
2019-09-03 10:29:29 +02:00
45f36ce1b7
Code clean in Tab.cpp and Fixed couple of Mac-warnings in :
...
GUI.cpp
GUI_App.cpp
GUI_ObjectList.cpp
MainFrame.hpp
Plater.cpp
PresetBundle.cpp
PresetHints.cpp
Tab.cpp
Tab.hpp
wxExtensions.cpp
wxExtensions.hpp
2019-09-03 10:29:17 +02:00
ab9ff0dfd9
GLGizmoSlaSupports.cpp: Snapshot label now differs for turning the gizmo on/off
...
This behaviour was broken by recent merge
2019-09-03 10:16:06 +02:00
0ab836d748
Merge branch 'lm_gizmomanagerrefactoring' into dev
2019-09-03 08:29:31 +02:00
2592164648
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-09-02 16:49:41 +02:00
4c37b3814a
Fix of SPE-1015 (Colorchange doesn't work correct on last and first layers)
2019-09-02 16:49:17 +02:00
550704d286
Merge branch 'lm_wiping_dialog_colors' into dev
2019-09-02 16:31:22 +02:00
a29b25d239
Fixed couple of warnings in GUI_ObjectList.cpp and GUI_ObjectSettings.cpp
2019-09-02 16:27:48 +02:00
3f67201fb9
Fixed couple of warnings
...
Turned several includes into forward declarations
Removed several sprintf calls in favor of std::to_string
2019-09-02 16:27:48 +02:00