Commit graph

1541 commits

Author SHA1 Message Date
Filip Sykala
f23c356507 Merge branch 'dev' into fs_mouse
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
2022-01-20 09:25:06 +01:00
enricoturri1966
f2a7245f36 Fixed Z-fighting in GCode preview when using GCode substitution 2022-01-19 09:28:50 +01:00
enricoturri1966
bebb5505a3 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Selection layers hints 2022-01-18 13:47:19 +01:00
enricoturri1966
22f38235ea Tech ENABLE_GLBEGIN_GLEND_REMOVAL - 1st installment - Selection bounding box 2022-01-18 10:42:46 +01:00
enricoturri1966
2cebe16663 Tech ENABLE_WIPETOWER_OBJECTID_1000_REMOVAL - Removal of wipe tower magic object_id equal to 1000 2022-01-17 15:56:58 +01:00
enricoturri1966
cfe8aa4818 Tech ENABLE_OBJECT_MANIPULATOR_FOCUS - 1st installment - Do not automatically set focus on 3D scene while hovering on it while the focus is into a field of the object manipulator 2022-01-17 12:17:59 +01:00
enricoturri1966
403f6d45f9 Refactoring - Removed member variable GLVolume::force_transparent 2022-01-17 08:24:46 +01:00
enricoturri1966
6f9efbf19a Follow-up of 9190810c1f - Modified code to use the new ColorRGBA 2022-01-17 08:16:13 +01:00
enricoturri1966
a9bd58639c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev 2022-01-17 08:05:41 +01:00
enricoturri1966
9190810c1f Fixed volume transparency when changing volume type 2022-01-17 08:04:07 +01:00
enricoturri1966
72b8b75c4c Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements 2022-01-14 11:24:31 +01:00
enricoturri1966
b9b702d550 Fixed conflicts after merge with branch dev 2022-01-14 09:55:13 +01:00
enricoturri1966
2549b5ff48 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements 2022-01-14 08:28:11 +01:00
enricoturri1966
6201dad245 Tech ENABLE_COLOR_CLASSES set as default 2022-01-14 08:19:00 +01:00
enricoturri1966
a2dc1cd446 Fixed conflicts after merge with dev branch 2022-01-12 15:54:48 +01:00
YuSanka
ced6d26917 Merge remote-tracking branch 'origin/master' into dev 2022-01-12 15:05:31 +01:00
enricoturri1966
243f5c38ee Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT set as default 2022-01-12 13:36:31 +01:00
enricoturri1966
b4308f4245 Tech ENABLE_MODIFIERS_ALWAYS_TRANSPARENT set as default 2022-01-12 12:35:36 +01:00
enricoturri1966
7274d2bb6e Fixed warning 2022-01-11 09:43:43 +01:00
enricoturri1966
acd225cee2 Techs ENABLE_NEW_CAMERA_MOVEMENTS_XXXX - 1st installment - Modified camera manipulation and selection by mouse 2022-01-11 09:09:09 +01:00
enricoturri1966
8d638a77e5 Refactoring of GLCanvas3D::check_volumes_outside_state() to prevent assert while using SLA printer 2022-01-05 11:17:39 +01:00
enricoturri1966
1019792884 Fixed conflicts after merge with dev branch 2022-01-03 10:09:38 +01:00
enricoturri1966
34a640a4a9 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_color_class 2022-01-03 09:33:05 +01:00
YuSanka
f2aeca3a71 Options from the "Preferences" dialog added to the Search
Some code refactoring:
* use GUI_App::open_preferences() on all places where it's needed
* Preferences Dialog is an attribute of a ManeFrame class and created just ones during the MainFrame creation now.
* Created class Highlighter. Use it in Preferences and Tab
2021-12-22 14:38:23 +01:00
enricoturri1966
ab99a7865f Fixed build of test_color.cpp on non-Windows OSs 2021-12-22 11:31:35 +01:00
enricoturri1966
d1822f3ca2 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_color_class 2021-12-22 10:50:59 +01:00
enricoturri1966
cd4094743e Tech ENABLE_COLOR_CLASSES - 1st installment -> Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation 2021-12-22 10:45:35 +01:00
Vojtech Bubnik
13566e3f93 Follow-up to acee3ff1f9
Fixed crash when changing modifier type on a circular printbed
2021-12-16 17:50:36 +01:00
enricoturri1966
acee3ff1f9 Fixed crash when changing modifier type on a circular printbed 2021-12-16 14:01:44 +01:00
Filip Sykala
b900a8109b fix warn from switch 2021-12-14 17:49:46 +01:00
Filip Sykala
03d0e36f2f Merge branch 'dev' into fs_mouse
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
2021-12-14 11:13:42 +01:00
Filip Sykala
c751d6327d Separate GizmoManager on_move into gizmo itself 2021-12-10 09:09:53 +01:00
Filip Sykala
96610ecea9 Suggestion to detect volume modification instead of check some gizmos during dragging 2021-12-08 15:32:13 +01:00
enricoturri1966
b45d56b5b8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-12-08 08:15:51 +01:00
bubnikv
6122f630d4 Fixing broken scrolling with a touch pad on some Windows laptops.
This issue #2750 is old, it was fixed and broken again.
Now it is being fixed differently.
2021-12-04 09:37:09 +01:00
enricoturri1966
18cb91a982 Fixed conflicts after merge with master 2021-11-30 12:13:51 +01:00
enricoturri1966
781b457035 Tech ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED set as default 2021-11-30 09:41:43 +01:00
enricoturri1966
75856d5e65 Tech ENABLE_SEAMS_USING_MODELS set as default 2021-11-30 08:36:55 +01:00
enricoturri1966
353a9e61f5 Fixed conflicts after merge with master 2021-11-29 11:53:45 +01:00
Lukáš Hejl
f4125f2db8 Fixed the collision between BuildVolume::Type::Convex and macro Convex defined inside /usr/include/X11/X.h that is included by WxWidgets 3.0. 2021-11-26 13:53:11 +01:00
enricoturri1966
2827609539 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2021-11-24 11:48:57 +01:00
enricoturri1966
c071132385 Fix of objects have wrong color when using convex printbeds - SPE-1132 2021-11-24 11:48:52 +01:00
Lukas Matena
eb389559b5 Fixup of cc44089 (bed bounding box 2D vs 3D)
The mentioned commit has changed behaviour of GLCanvas3D::get_size_proportional_to_max_bed_size(double)
function so that it uses XYZ bounding box instead od just XY. As a result, adding a box object through
the right panel added a huge box when printer max_print_z was higher than x/y. Offset at which a new
object instance is added was also affected.
2021-11-24 10:41:21 +01:00
enricoturri1966
c242f31353 Fixed conflicts after merge with master 2021-11-23 08:48:11 +01:00
Lukas Matena
f30a018c5a Clamp radius in variable layer height dialog, negative values led to a crash 2021-11-22 15:22:43 +01:00
enricoturri1966
a4baecb340 #7326 - Fixed crash when starting GCodeViewer 2021-11-22 10:57:38 +01:00
Vojtech Bubnik
56f409921c Improved some string initialization and zeroing.
Assigning = "" in constructor does not make sense,
.clear() is better than = "",
default paramaeter = {} is cheaper than = ""
2021-11-19 15:34:22 +01:00
enricoturri1966
8d046a577a Fixed wrong color of toolpaths in pre-gcode preview 2021-11-16 14:52:07 +01:00
enricoturri1966
cb44542377 Fix for broken zoom to bed command 2021-11-16 13:40:24 +01:00
enricoturri1966
9561fd8cc6 Removed obsolete gouraud shader files 2021-11-16 12:56:08 +01:00