Commit Graph

6532 Commits

Author SHA1 Message Date
Enrico Turri
affd4e0cbc Cached world matrix of GLVolume to speed up rendering 2018-08-28 16:08:43 +02:00
Enrico Turri
3869c45414 Removed unused methods 2018-08-28 15:19:53 +02:00
tamasmeszaros
fef141f40a Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-28 15:17:35 +02:00
tamasmeszaros
dc9d347540 png export parameters routed to SLA print config. PngExportDialog disabled. 2018-08-28 14:55:40 +02:00
Enrico Turri
bdbc776ae3 Eigenized 3mf I/O 2018-08-28 14:30:36 +02:00
Enrico Turri
af52a99530 More eigenized gizmos 2018-08-28 13:23:28 +02:00
Enrico Turri
d043df8ff1 Removed 2D gizmos 2018-08-28 12:50:26 +02:00
Enrico Turri
2457c43ad9 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-28 12:05:30 +02:00
Enrico Turri
556896dd1c Fixed rotate gizmo position after arrange 2018-08-28 12:05:16 +02:00
tamasmeszaros
8f04503180 fix build for Linux 2018-08-28 11:55:10 +02:00
tamasmeszaros
14d81bcde1 added max merge distance parameter 2018-08-28 10:52:18 +02:00
Enrico Turri
48f1ab1caf Fixed 3D scene mouse capture 2018-08-28 09:31:23 +02:00
Enrico Turri
7a3957a193 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-28 09:04:12 +02:00
Enrico Turri
02d4fa0583 Tweaks to GLGizmoFlatten 2018-08-28 09:03:03 +02:00
tamasmeszaros
5e63749852 png export recovered 2018-08-27 16:58:20 +02:00
tamasmeszaros
4c4989583d fix centroid error for two points and merge with dev. 2018-08-27 16:20:13 +02:00
tamasmeszaros
24bcec4901 generalization for more than one concave hulls. 2018-08-27 15:18:28 +02:00
Enrico Turri
2c2657c4d1 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:56:23 +02:00
Enrico Turri
384b0a94fa Fixed moving center of rotate gizmo 2018-08-27 14:54:20 +02:00
Enrico Turri
e7be2e0d57 Fixed undefined axis in rotate method of plater.pm 2018-08-27 14:13:06 +02:00
Enrico Turri
99262e2d59 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri
a3bd7c110f Fixed conflicts after merging with master 2018-08-27 14:00:53 +02:00
tamasmeszaros
991b427479 FIxed build errors caused by merge and flipped normals of the SLA pool walls. 2018-08-27 11:59:37 +02:00
tamasmeszaros
33c5ecd6f6 Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-27 09:53:52 +02:00
bubnikv
c27a2fcc7c Bumped up the version number to 1.41.0-beta2 2018-08-25 22:11:04 +02:00
bubnikv
d1580769a9 Changed the wording of "Purge into this object's ..." to "Wipe ..." 2018-08-25 22:09:55 +02:00
bubnikv
49c500d708 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-08-24 16:58:53 +02:00
YuSanka
52fa83739f Fixed post-merge compilation problem 2018-08-24 16:56:42 +02:00
Lukas Matena
87945498bf Bugfix - dialog that changes number of copies deleted the object when cancelled 2018-08-24 16:52:06 +02:00
bubnikv
cf3e99f94d Merge remote-tracking branch 'remotes/origin/lm_lay_flat_round_merged_facets' 2018-08-24 16:39:24 +02:00
bubnikv
466b385716 Merge remote-tracking branch 'remotes/origin/lm_retraction_fix' 2018-08-24 16:33:57 +02:00
YuSanka
fddd0f566f Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 16:28:34 +02:00
YuSanka
8341e5c945 Fixed post-commit compilation problems 2018-08-24 16:20:19 +02:00
Enrico Turri
d56054a20e Mouse capture when dragging gizmos 2018-08-24 15:49:57 +02:00
Enrico Turri
b940c36a05 Removed scale and rotate actions from toolbar 2018-08-24 15:08:19 +02:00
YuSanka
a19d658cd3 Merge remote-tracking branch 'origin/new_main_page_ui' into dev 2018-08-24 15:01:26 +02:00
Enrico Turri
31715e224c Added tooltip to gizmos 2018-08-24 14:11:41 +02:00
YuSanka
38bbbf8515 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 13:58:21 +02:00
YuSanka
98a8783083 Added "one_layer" mode for PrusaDoubleSlider 2018-08-24 13:36:19 +02:00
YuSanka
e4067440d7 Fixed after-merging compilation problems 2018-08-24 12:54:21 +02:00
Lukas Matena
573f922129 Edited captions and default values of the new parameters (initial loading and unloading speed) 2018-08-24 12:46:32 +02:00
Enrico Turri
c9e1cfe516 Renamed private member functions in GLToolbar 2018-08-24 12:32:14 +02:00
YuSanka
8c066dddcd Merge remote-tracking branch 'origin/SLA_ui' into dev 2018-08-24 12:20:24 +02:00
Enrico Turri
812aec7c52 Added snap to scale to rotate gizmo 2018-08-24 12:16:11 +02:00
Enrico Turri
9e85ddbcf4 Modified render order of gizmos 2018-08-24 12:06:05 +02:00
Lukas Matena
a4b0708452 Lay flat - simple rejection of very small surfaces 2018-08-24 11:46:54 +02:00
Vojtech Kral
cec818c969 Firmware updater: Fix a race condition
avrdude: Handle OOM with configurable handler
2018-08-24 11:21:29 +02:00
Enrico Turri
1e180c990a 3D gizmos grabbers always visible to picking pass 2018-08-24 11:17:53 +02:00
Enrico Turri
89a45caf7b Fixed direction of rotate gizmo around y axis 2018-08-24 10:32:05 +02:00
Enrico Turri
5e23b1eb4b Use double in place of coordf_t 2018-08-24 10:20:00 +02:00