e2ce240ec3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-31 13:32:47 +01:00
89e2732b06
Updated KBShortcutsDialog
2019-01-31 13:21:33 +01:00
736ef3373e
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-01-31 13:19:46 +01:00
0fd82f7fa0
User mode-aware toolbar items
2019-01-31 13:19:26 +01:00
c5279c3ee6
Added call to _set_current() into GLCanvas3D::on_mouse()
2019-01-31 10:50:16 +01:00
a645e61ec7
Merge remote-tracking branch 'origin/master' into tm_colldetection_upgr
2019-01-31 10:11:56 +01:00
278f67710c
Getting rid of signed distance from collision detection.
2019-01-31 10:11:37 +01:00
5b1f837b39
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-01-31 09:37:38 +01:00
583b8a9a2b
glsafe macro to test for the glGetError in debug mode
2019-01-31 09:37:27 +01:00
ec7dff8b81
GLCanvas3D -> added call _set_current() to method accessing GPU memory
2019-01-31 09:15:43 +01:00
1ab6d67e97
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-01-31 09:09:42 +01:00
7609081697
Fixed name of the exported project file to respect the object name.
2019-01-31 09:08:40 +01:00
32dcaba725
replace #ifdef _DEBUG with #ifndef NDEBUG
2019-01-31 08:47:23 +01:00
9df8de0f14
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
4f802e5c81
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-01-30 19:02:43 +01:00
5153261a8b
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
45be9b7cf9
Getting around signed_distance in pinhead_mesh_intersect
2019-01-30 17:35:39 +01:00
78505009aa
Added menu item for the "Fix through the Netfabb"
2019-01-30 16:27:33 +01:00
3654f708f2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 16:19:59 +01:00
e3c0315865
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
e8e8e7e9c5
Updated draw_colored_band() according to the new colors.
...
+ some code refactoring
2019-01-30 14:45:18 +01:00
0cd0041cc6
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 14:09:18 +01:00
1da994fe4e
Trying to speed up collision detection with tbb
2019-01-30 13:51:34 +01:00
cc560c2d1d
Fix to my last commit
2019-01-30 13:26:16 +01:00
a9955a4bc8
Added debug output to test event handling sequence between Objects List and Object Manipulator fields
2019-01-30 12:18:01 +01:00
82ad214339
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 12:16:49 +01:00
0a6eb54e55
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-01-30 12:10:38 +01:00
dd0d976adb
Some optimizations of the color print preview.
2019-01-30 12:10:26 +01:00
1a69cea320
Implemented object/part renaming under OSX, using popup_menu
2019-01-30 11:35:37 +01:00
f1ca3f049a
Fixed first binding for "Split to parts" menu item in ObjectList
2019-01-30 10:06:10 +01:00
3f9098a62e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 10:03:22 +01:00
1a58f0ca32
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-01-30 10:00:57 +01:00
e6034eaee3
Hide slicing results after Delete All command
2019-01-30 10:00:38 +01:00
26f0f40931
Merge remote-tracking branch 'remotes/origin/ys_color_print'
2019-01-30 09:29:55 +01:00
ee38bab4d2
Updated the github issue template
2019-01-30 09:07:29 +01:00
12d4c86ec7
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-30 08:27:52 +01:00
b4c015ba8f
Fix of a G-code comment. Fixes
...
Incorrect filament profile being used during purge - always set to PLA. #1691
2019-01-29 18:28:52 +01:00
c660eb6f45
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-01-29 18:08:02 +01:00
52c1ec873e
Disabled the experimental pressure equalizer.
2019-01-29 18:07:45 +01:00
51ceb404c2
Tab: Update print host address and cafile properly, fix #1687
2019-01-29 17:11:07 +01:00
2b1d2acf17
Build: MSVC 2017 compat (w/o xs code - Perl unit tests)
2019-01-29 17:11:07 +01:00
1148a7dc32
Fix of #1713
2019-01-29 16:11:53 +01:00
d28cecf6c5
Implemented "Color Print" for preview mode (without re-slicing)
2019-01-29 15:11:29 +01:00
6ae0565a1d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-29 15:11:25 +01:00
3adaceed2d
Many major issues solved. Performance may be degraded.
2019-01-29 15:10:07 +01:00
c5d50a39ea
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-01-29 14:44:25 +01:00
458f3358fe
Renamed Open / Save to Open Project / Save Project
2019-01-29 14:44:10 +01:00
3894b01b3c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into sidebar_fixes
2019-01-29 14:34:13 +01:00
eca770397c
Fix of #1730
2019-01-29 14:16:31 +01:00
dab95c927f
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2019-01-29 13:36:35 +01:00
