7c732c7482
Trying to fix some Linux & OSX compilation issues.
2019-07-04 23:34:18 +02:00
211d1ee1e3
Trying to make all C++ of the platforms happy.
2019-07-04 22:52:33 +02:00
9fd0c55eb8
Simplified the "cereal" includes to not clash with Perl includes
2019-07-04 22:09:14 +02:00
497b01f24a
Trying to fix some template resolution on Linux
2019-07-04 21:02:08 +02:00
b1420283b6
Fixed merge issues.
2019-07-04 20:49:46 +02:00
3a24fb2f47
Yet another compilation fix.
2019-07-04 20:25:52 +02:00
c7cc760067
Merge remote-tracking branch 'origin/master' into vb_undo_redo
2019-07-04 20:22:15 +02:00
1070991149
Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo
2019-07-04 20:15:50 +02:00
3e5f9b5a22
Removed some junk templates, which pass compilation on Windows
...
even if they are invalid.
2019-07-04 19:59:45 +02:00
70c6558a4c
Fix of compilation on Linux
2019-07-04 19:48:00 +02:00
a29cc9e242
Update object list after undo/redo
2019-07-04 19:46:46 +02:00
1798e2a84c
WIP Undo / Redo : serialization / deserialization of object selection.
2019-07-04 14:35:04 +02:00
e4d8c5410c
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-07-04 14:26:05 +02:00
5a2ace1a6e
WIP Undo / Redo: First Undo in the history of PrusaSlicer!
2019-07-04 10:45:41 +02:00
e2a670218b
WIP Undo / Redo: Serializing the configs of ModelObject / ModelVolume
...
/ ModelMaterial as separate objects to conserve memory.
2019-07-03 13:43:54 +02:00
5e846112ee
WIP UndoRedo: Added Undo/Redo stack, added Platter::take_snapshot(),
...
experimental snapshots on loading STLs and increasing / decreasing
model instances.
2019-07-02 16:42:23 +02:00
136e5156bc
Fixed colot_print issues:
...
* Disabled color change information for the SLA and FFF-multimaterial presets
* Corrected switch between "color print" and "feature type" on Preview
2019-07-02 14:06:58 +02:00
f09fb92b61
Fix build against system-provided qhull
2019-07-02 11:43:07 +02:00
125f474f02
Merge remote-tracking branch 'origin/master' into ys_new_features
2019-06-29 12:38:03 +02:00
61080bcff6
Merge branch 'bugfixes': avrdude warnings cleanup
2019-06-28 15:21:45 +02:00
0b940ec089
Some code improvements
2019-06-27 16:07:32 +02:00
37b37cdf25
Fixed small typo
2019-06-27 14:13:07 +02:00
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
27ee68d2f9
WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase
2019-06-27 11:02:45 +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
d99e932ee8
WIP Undo / Redo: Serialization of the Model / ModelObject / Model instance
...
using the cereal framework.
2019-06-26 16:29:12 +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
a710e7e7e4
WIP: Undo / Redo stack.
...
Integration of the "cereal" serialization library.
Serialization / deserialization of the DynamicConfig / DynamicPrintConfig.
DynamicPrintConfig serializes ordinal identifiers instead
of the option key strings to conserve space.
2019-06-26 13:26: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
85575e5615
Fix: IsTriviallyCopyable on clang
2019-06-25 18:16:53 +02: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
bubnikv