Enrico Turri
c31a648bf7
1st attempt to fix SPE-807
2019-02-04 10:06:15 +01:00
Enrico Turri
fe7806c7f0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes
2019-02-04 09:55:48 +01:00
bubnikv
7c5d94e0b1
Don't capture Cmd+A on OSX in Canvas, it works throug the menu accelerators.
2019-02-04 09:37:49 +01:00
Enrico Turri
9b9d35d90d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes
2019-02-04 08:36:28 +01:00
bubnikv
d0b1b3b3de
Trying to convince OSX that we want the Control key to behave as Command
...
key when accessing OSX machine over VNC from a PC.
2019-02-03 17:57:55 +01:00
bubnikv
14a623f50e
Removed GLCanvas3D::on_key_down() handler, as it is replaced
...
by the on_char() handler.
2019-02-03 14:11:09 +01:00
bubnikv
0c1f750cba
The accelerators Ctrl+A, Ctrl+Del and Del were incorrectly captured
...
globally by being defined in the Edit menu.
These accelerators are now suppressed in the menu (shown on Windows
but inactive, not shown on OSX / Linux),
and they are now captured by the 3D scene widget instead.
Fix of ctrl-A doesn't work well #1753
2019-02-03 14:06:13 +01:00
bubnikv
5deb8fcc65
Suppressed the "Split to volumes" button in simple mode.
2019-02-03 11:15:26 +01:00
bubnikv
f050d91239
OSX specific: The Command short keys over the 3D scene toolbars
...
are now shown with the OSX "Command" symbols, not as "Ctrl+"
2019-02-03 11:10:25 +01:00
Enrico Turri
e00fb7ba43
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes
2019-02-01 15:14:19 +01:00
Enrico Turri
016507f4ef
Merge branch 'sidebar_fixes' of https://github.com/prusa3d/Slic3r
2019-02-01 14:32:21 +01:00
Enrico Turri
8f87ae5ca9
Added other debug output to investigate SPE-807
2019-02-01 13:15:24 +01:00
Enrico Turri
3e7f76b578
Added debug output to investigate SPE-807
2019-02-01 11:54:18 +01:00
Enrico Turri
fb6ef1d20f
Keeps modifier transparent while layer editing tool is enabled
2019-01-31 14:25:11 +01:00
Enrico Turri
5fa5d495bb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-31 13:32:47 +01:00
Enrico Turri
035ef9cb23
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-01-31 13:19:46 +01:00
Enrico Turri
81c621716b
User mode-aware toolbar items
2019-01-31 13:19:26 +01:00
Enrico Turri
85f7d28c6f
Added call to _set_current() into GLCanvas3D::on_mouse()
2019-01-31 10:50:16 +01:00
Enrico Turri
0a72a4e7ad
GLCanvas3D -> added call _set_current() to method accessing GPU memory
2019-01-31 09:15:43 +01:00
bubnikv
991632add5
GLCanvas3d::on_render(): if not intialized yet,
...
Call render directly, so it gets initialized immediately, not from On Idle handler.
2019-01-30 19:48:26 +01:00
bubnikv
ed9a924880
Added missing GL context "Set Current" calls before loading data
...
into vertex buffers.
Changed behavior of Canvas3D::on_render() to postpone rendering to idle,
as on OSX the paint events happen directly from control updates,
if the control update triggers Canvas3D window rescaling. With this change,
rendering only happens from idle handler consistently.
2019-01-30 19:02:30 +01:00
Enrico Turri
3deeab90f3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 16:19:59 +01:00
bubnikv
eec289961a
Removed Microsoft specific _DEBUG flag from the Unix systems.
...
Made condional compilation of assert code based on #ifndef NDEBUG
instead of #ifdef _DEBUG to compile on Unix systems.
2019-01-30 15:27:11 +01:00
YuSanka
5a28693ff4
Updated draw_colored_band() according to the new colors.
...
+ some code refactoring
2019-01-30 14:45:18 +01:00
Enrico Turri
883e09fbcd
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 12:16:49 +01:00
bubnikv
460cf820af
Some optimizations of the color print preview.
2019-01-30 12:10:26 +01:00
bubnikv
d30676ceee
Merge remote-tracking branch 'remotes/origin/ys_color_print'
2019-01-30 09:29:55 +01:00
Enrico Turri
414ea1a86e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 08:27:52 +01:00
Enrico Turri
ed71f2ccd7
Fix of #1713
2019-01-29 16:11:53 +01:00
YuSanka
e291172e24
Implemented "Color Print" for preview mode (without re-slicing)
2019-01-29 15:11:29 +01:00
Enrico Turri
4776ad786f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-29 12:09:01 +01:00
Enrico Turri
b47355a325
Added limit to zoom in
2019-01-29 12:05:49 +01:00
Enrico Turri
14fe55d4b8
Fix of rotations using sidebar fields
2019-01-29 11:26:35 +01:00
Enrico Turri
6137cc48eb
ENABLE_IMPROVED_SIDEBAR_OBJECTS_MANIPULATION set as default
2019-01-28 16:06:44 +01:00
Enrico Turri
1c0bc8a5f3
Fixed synchronization between Objects List and Object manipulator table
2019-01-28 15:50:02 +01:00
bubnikv
3e0ef05386
Merge remote-tracking branch 'remotes/origin/objects_centering'
2019-01-28 10:25:41 +01:00
Enrico Turri
6f25a933b6
Removed check of max rotation close to zero in GLCanvas3D::Selection::rotate()
2019-01-28 09:59:22 +01:00
Enrico Turri
7c6572025d
Fixed bed centering when changing printer with preview active
2019-01-28 09:06:14 +01:00
Enrico Turri
1550ee0e2b
Merge branch 'objects_centering' of https://github.com/prusa3d/Slic3r into objects_centering
2019-01-28 08:53:46 +01:00
bubnikv
66ecdf61ec
FIx of the previous commit
2019-01-28 08:53:02 +01:00
bubnikv
bb0cf221bc
WIP synchronization of Z rotation of the instances
2019-01-28 08:52:22 +01:00
Enrico Turri
c2d34cea89
Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering
2019-01-28 08:38:24 +01:00
bubnikv
241283d956
Merge remote-tracking branch 'remotes/origin/vk-bugfixes'
2019-01-26 13:10:58 +01:00
Enrico Turri
03f186c002
Merge branch 'objects_centering' of https://github.com/prusa3d/Slic3r into objects_centering
2019-01-25 15:16:33 +01:00
bubnikv
708a14c228
Fix of instance synchronization. It seems to be working, but one may
...
want to review the center of rotation of the instances when rotating
around a general axis (zero component of the rotation axis in the world Z).
2019-01-25 14:56:41 +01:00
Enrico Turri
9f734a073f
Disable active gizmo as soon as the selection is cleared by clicking on the scene out of any object
2019-01-25 14:55:20 +01:00
Enrico Turri
348aa48121
Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering
2019-01-25 11:50:34 +01:00
Enrico Turri
be1d9c693c
Free camera rotation for sla printer
2019-01-25 11:35:28 +01:00
bubnikv
dbcf800353
Yet another compilation fix on OSX
2019-01-25 09:57:08 +01:00
Enrico Turri
3b90629d85
Merge branch 'master' of https://github.com/prusa3d/Slic3r into objects_centering
2019-01-25 09:10:26 +01:00