dd1fb286c3
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-27 14:01:50 +02:00
cecc134550
Rewrote layers information export/import to/from 3mf using Boost Property Tree (xml_parser)
2019-06-27 13:55:24 +02:00
75b0f65d79
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-06-27 11:25:13 +02:00
90d1ac2c8f
Tech ENABLE_RENDER_PICKING_PASS extended so that user can switch between picking pass texture rendering and regular rendering by pressing [T] key
2019-06-27 11:25:04 +02:00
71d1255219
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2019-06-27 09:48:31 +02:00
da3583b1db
Fix of https://github.com/prusa3d/PrusaSlicer/issues/2516
2019-06-27 09:48:19 +02:00
d16c670ed1
Merge pull request #2569 from BeldrothTheGold/master
...
Add debug preprocessor directive in Technologies.hpp to render picking pass to window.
2019-06-27 09:44:48 +02:00
dd108f4513
Hotfix for inconsistent slice index
2019-06-26 14:59:39 +02:00
1525a864c5
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-26 13:33:05 +02:00
624a6aefb4
Fixed crashes after loading some AMFs.
2019-06-26 13:29:49 +02:00
f93e7496f7
Merge branch 'tm_scales'
2019-06-26 11:33:42 +02:00
6ff434aba3
Fixes some ModelArrange warnings
2019-06-26 11:10:41 +02:00
14b32c4f16
Make an order in using scale and unscale, remove some warnings.
2019-06-26 10:34:27 +02:00
d818d1b429
Add debug option to display picking pass to screen
2019-06-25 19:25:03 -06:00
daac165a44
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-24 13:56:35 +02:00
75ed542686
Reformatted MTUtils with some refined directives.
...
Only whitespace changes in MTUtils.hpp !
2019-06-24 13:03:46 +02:00
121b6c078b
Print bed not considered as object in arrange anymore.
2019-06-24 13:01:52 +02:00
fab3634931
#2395 - Reworked logic of method Model::convert_multipart_object()
2019-06-24 12:43:18 +02:00
1459ad65c6
#2433 - Time Estimator: clamp accelerate/decelerate distances to avoid them to become negative
2019-06-24 12:35:20 +02:00
6b0d75127b
#2428
...
1) Reworked logic for pasting volumes
2) Fixed paste of volumes into different objects
3) Do not apply offset when pasting into the copied object
4) Keep source transformation matrix and relative positions when copy/pasting volumes into another object
2019-06-24 12:26:11 +02:00
38d5817bc9
Disabled ENABLE_CAMERA_STATISTICS
2019-06-24 11:23:25 +02:00
5766e9e915
Fixed conflicts after merge with branch et_perpsective_camera
2019-06-24 11:08:42 +02:00
00b9a3ad32
ENABLE_COMPRESSED_TEXTURES set as default
2019-06-24 09:54:58 +02:00
301eda7369
ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default
2019-06-24 09:27:19 +02:00
96276394d1
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments
2019-06-24 08:15:41 +02:00
7de5a42df3
Fixed compilation on clang / OSX (missing float.h)
2019-06-20 21:07:26 +02:00
b7a949a53e
Fix for C++11
2019-06-20 20:40:17 +02:00
ac6969c992
Reworked the Perl unit / integration tests to use the same Print
...
interface that the application is using. Old interface used just
for the integration tests was removed.
2019-06-20 20:23:05 +02:00
27459a9072
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-06-20 16:15:26 +02:00
35b3fd3176
Integrated the new layer height spans with configs into the backend.
...
Fixed some compiler warnings.
2019-06-20 16:15:09 +02:00
2ae2672ee9
Building igl statically and moving to the dep scripts
...
Fixing dep build script on Windows and removing some warnings.
Use bundled igl by default.
Not building with the dependency scripts if not explicitly stated. This way, it will stay in
Fix the libigl patch to include C source files in header only mode.
2019-06-19 14:52:55 +02:00
5dcc6c7f36
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 14:33:31 +02:00
89e39e3895
Eliminate magic constant
2019-06-19 13:19:11 +02:00
670a563226
Fix for issue #2536
2019-06-19 12:04:11 +02:00
4a71c42f9b
Merge branch 'master' into tm_rotcalipers
2019-06-19 11:07:21 +02:00
28dd52d88b
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-19 08:17:58 +02:00
b4ef812d32
Merge branch 'master' into tm_sla_printer_mirror
2019-06-18 17:42:10 +02:00
468516aa31
Apply fixes for the ui jobs.
...
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
2019-06-18 16:24:30 +02:00
d60ecb3788
Merge remote-tracking branch 'origin/master' into tm_ui_jobs
2019-06-18 12:16:24 +02:00
0c95d4e0d9
Merge remote-tracking branch 'remotes/origin/ys_new_features'
2019-06-18 10:01:29 +02:00
c95a324c3f
Merge branch 'vb_admesh_fix'
2019-06-18 08:54:50 +02:00
7fe8965c53
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-17 13:50:12 +02:00
ce22251707
Warning hunt session followup
2019-06-17 10:05:46 +02:00
ddb4c1ff3f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-17 09:34:25 +02:00
9ffd294f07
Fixed functions declaration template<class Tf> inline constexpr coord_t scaled(Tf val) and template<class Tf> inline constexpr Tf unscaled(coord_t val) to use constexpr on versions of Visual Studio which support it
2019-06-17 09:28:41 +02:00
c5037540e9
Warning hunt session.
2019-06-14 18:17:17 +02:00
f8c5570155
Removed unnecessary copy / move constructors / assignment operators.
2019-06-14 15:47:40 +02:00
541f58c656
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera
2019-06-14 10:57:29 +02:00
9b7bb41db5
ModelObject::add_volume(const ModelVolume &other)
...
shall not re-center the volume as it will share meshes
(object mesh, convex hull mesh) of the source,
which may be in use by the background processing.
2019-06-13 17:24:37 +02:00
9379fedd43
Further C++isation of the admesh library & TriangleMesh
...
(copy & move constructors / operators)
2019-06-13 16:33:50 +02:00
YuSanka