Commit Graph

285 Commits

Author SHA1 Message Date
Enrico Turri
b4beb7aae9 3DScene plain shader moved to c++ 2018-05-23 09:57:44 +02:00
Enrico Turri
85b6784dcb Merge with master 2018-05-22 15:03:40 +02:00
bubnikv
306d77559e Merge remote-tracking branch 'remotes/origin/scene_manipulators' 2018-05-22 14:32:07 +02:00
Enrico Turri
451c58d58f 3DScene's enable_picking variable moved to c++ 2018-05-22 09:02:42 +02:00
Enrico Turri
3fdc5e20a7 Warning texture moved to c++ 2018-05-21 14:40:09 +02:00
Enrico Turri
3fb96ff636 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 13:06:16 +02:00
YuSanka
64b905820d Fixed bugs with non-correct update of buttons enable.
Set minimum size for the scrolled_window_panel.
2018-05-21 12:34:31 +02:00
Enrico Turri
67f7ec2d20 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-21 11:17:55 +02:00
Enrico Turri
ad5eab8fd7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-21 11:17:45 +02:00
Enrico Turri
53ddf724e1 Fixed object setting dialog on NVIDIA cards 2018-05-21 10:51:47 +02:00
Enrico Turri
a7fc57a176 3DScene reset_object method moved to c++ 2018-05-18 14:08:59 +02:00
Enrico Turri
5fc8fdee11 3DScene axes moved to c++ 2018-05-18 13:02:47 +02:00
Enrico Turri
0584990b65 Fixed z layers indices under 3D preview sliders 2018-05-18 10:14:47 +02:00
Enrico Turri
de0b8226e1 Tweaks to logic for sliders update in 3D Preview 2018-05-17 16:02:31 +02:00
Enrico Turri
f7702c05f2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 15:22:55 +02:00
Enrico Turri
c9dc54bed7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 15:20:25 +02:00
Enrico Turri
9b4afb77d1 Hide legend texture when invalidating gcode by editing config data 2018-05-17 15:18:52 +02:00
Enrico Turri
2b4829a4b9 3DScene bed variables moved to c++ 2018-05-15 15:38:25 +02:00
Enrico Turri
32063cbe23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-14 10:02:28 +02:00
Enrico Turri
1edd2d01f0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-14 10:01:27 +02:00
Enrico Turri
5fb81bacd5 Added layer index under sliders in 3D view 2018-05-14 09:54:38 +02:00
bubnikv
ae1a015494 Fixed Perl array addressing issues, leading to crashes when loading
additional objects at the 3D path preview window.
2018-05-11 16:03:07 +02:00
Enrico Turri
5024fc4be7 OpenGL to c++ 1st installment - WIP 2018-05-09 10:47:04 +02:00
Enrico Turri
bd4061c3b0 Merge with master branch 2018-05-09 10:16:28 +02:00
Enrico Turri
8eb9ddc2eb Max count of auto assigned extruders when splitting object set as dependent of current printer 2018-05-07 16:13:58 +02:00
Enrico Turri
81636abaa9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-02 14:45:42 +02:00
Enrico Turri
e2e4310322 Removed unneeded scene reloads when selecting objects 2018-05-02 13:55:04 +02:00
Enrico Turri
8096ef6844 Fixed wrong countours for multipart objects in cut dialog 3D view 2018-04-25 15:16:39 +02:00
Enrico Turri
449aff0f62 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-04-25 11:01:32 +02:00
Enrico Turri
ccd1c01d0b Fixed automatic view type selection when changing printer 2018-04-24 14:21:31 +02:00
Enrico Turri
71d9500b2e More robust fix for 3D view and GUI buttons not in synch when object's size is almost identical to print volume's size 2018-04-24 09:00:33 +02:00
Enrico Turri
a3c3eb5d2a Fixed GCode Preview not invalidated when deleting an object 2018-04-23 15:30:41 +02:00
Enrico Turri
f8b1dc5506 Tweaks to zooming logic 2018-04-23 08:44:24 +02:00
bubnikv
913cdef297 Merge remote-tracking branch 'origin/scene_manipulators' 2018-04-13 16:54:22 +02:00
Enrico Turri
659eb3412b Fixed value of z in cut dialog when object is scaled 2018-04-13 14:40:42 +02:00
Enrico Turri
7b29ecb15c Fixed cutting plane z in 3D view when object is scaled 2018-04-13 12:15:43 +02:00
Enrico Turri
d789b5c0df Fixed warning texture not disappearing when deleting object out of bed 2018-04-10 14:12:16 +02:00
Enrico Turri
a81f78045b Delete key enabled in Object's Settings Dialog also for 3D view 2018-04-10 12:47:09 +02:00
Enrico Turri
254592c849 Delete key enabled in Object's Settings Dialog 2018-04-09 14:20:44 +02:00
Enrico Turri
3a61833d13 Update view in object's setting dialog when changing extruder 2018-04-05 15:55:50 +02:00
Enrico Turri
76beaa6421 Objects colored by extruder color 2018-04-05 12:52:29 +02:00
Lukas Matena
eb9917536c Merge branch 'master' into wipe_tower_improvements 2018-04-04 13:06:46 +02:00
bubnikv
00324a14b8 Merge remote-tracking branch 'origin/scene_manipulators' 2018-04-04 11:06:45 +02:00
Lukas Matena
985b414c64 Removed parameter 'wipe_tower_per_color_wipe' from UI and configuration layer 2018-03-22 13:37:01 +01:00
Enrico Turri
ebb2d45761 Out of bed detection - Disabled GUI buttons when object outside bed 2018-03-21 15:21:03 +01:00
Enrico Turri
4a179c81d2 GCode Preview - Added visualization of volumetric flow rate 2018-03-21 10:03:10 +01:00
Lukas Matena
3d6f6530c0 Merge branch 'master' into wipe_tower_improvements 2018-03-16 14:06:23 +01:00
bubnikv
ab654f6319 Merge branch 'scene_manipulators' 2018-03-14 16:15:26 +01:00
bubnikv
de2d08f626 Update of G-code preview colors by Jindra. 2018-03-14 15:00:12 +01:00
Enrico Turri
523b297738 Out of bed detection - Volume colors changed while dragging them 2018-03-13 14:37:59 +01:00