3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,016 Commits 1 Branch 1 Tag 249 MiB
nonplanar
Commit Graph

1001 Commits

Author SHA1 Message Date
bubnikv
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
bubnikv
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
bubnikv
8bf6e69851 Removed the layer_height_ranges from the Perl bindings and unit tests. 2019-06-20 16:28:37 +02:00
bubnikv
35b3fd3176 Integrated the new layer height spans with configs into the backend. 
Fixed some compiler warnings.
 2019-06-20 16:15:09 +02:00
bubnikv
0bb8ee149e Sharing TriangleMesh objects between the front end (UI) and back end 
(background processing)
 2019-06-11 17:08:47 +02:00
bubnikv
af5017c46c admesh refactoring: Use Eigen vec3i for indexed triangles. 2019-06-10 21:14:58 +02:00
bubnikv
6defabea53 admesh refactoring: separation of the shared vertices / indices 
into an indexed_triangle_set structure
 2019-06-10 18:30:54 +02:00
bubnikv
65238a89b1 admesh refactoring: Removed the shared_vertices counter as it is now 
contained inside v_shared std::vector
 2019-06-10 17:36:15 +02:00
bubnikv
a1c38794fb Refactored admesh to get rid of the error and fp members of stl_file. 2019-06-10 17:17:36 +02:00
bubnikv
c7ba48a473 Fix of perl bindings 2019-06-05 09:54:52 +02:00
Lukas Matena
07282eb24d Fixed unit tests when run with range checks on std::vector 
There was a bug in unit tests that led to generating the wipe tower with non-normalized preset.
This caused out-of-bounds access into max_layer_height vector in fill_wipe_tower_partitions.
The problem surfaced in https://github.com/prusa3d/PrusaSlicer/issues/2288.
I quickly patched additional normalization of the preset to prevent this from happening.

Also, an assert in the same function turned out to trip on one of the tests.
This one was commented out for now and will (hopefully) be looked into later.

Function Print::apply_config was renamed to apply_config_perl_tests_only so everyone
sees its current purpose and does not mistake it for the more important Print::apply.
 2019-05-22 16:48:20 +02:00
Jason Tibbitts
58d78e8dbd Fix two errors with -Werror=format-security 
Fedora (and, I supposed, most recent Linux distros) build everything
with -Werror=format-security.  If you attempt to build with
-DSLIC3R_PERL_XS (which we need in order to run the test suite), the
build fails because of two strings in the Perl XS code:

/usr/bin/perl -MExtUtils::XSpp::Cmd -e xspp -- -t "/builddir/build/BUILD/PrusaSlicer-version_2.0.0-rc2/xs/xsp/typemap.xspt" "/builddir/build/BUILD/PrusaSlicer-version_2.0.0-rc2/xs/xsp/Print.xsp":585:31: error: format not a string literal and no format arguments [-Werror=format-security]

Ths fixes up two instances of that.
 2019-05-20 18:16:13 +02:00
bubnikv
0787fa861a Updated handling of the SLIC3R_BUILD_ID key 2019-05-13 18:01:00 +02:00
bubnikv
a61e833536 Implemented the "Support for support enforcers only" quick selection. 
Reduced some memory leaks due to the ConfigDef::default_value pointer.
 2019-05-03 18:01:39 +02:00
bubnikv
7aa4fd0827 Another fix of the perl bindings 2019-04-16 10:53:55 +02:00
bubnikv
7f4e6328fa Fixed trianglemeshslicer perl bindings, thus the unit tests. 2019-04-16 10:39:17 +02:00
bubnikv
496922036f Harmonized the application naming. 2019-04-15 16:14:19 +02:00
bubnikv
df8d475363 Fixed perl bindings 2019-03-13 16:53:08 +01:00
bubnikv
18025cc669 Reworked the command line interface based on the current state 
of the upstream.
Thanks @alexrj, @lordofhyphens for the original code of slic3r.cpp
 2019-03-13 15:44:50 +01:00
bubnikv
9996a01c84 Fixed Perl bindings. 2019-03-01 18:09:42 +01:00
bubnikv
37f96db9fe Fixed Perl bindings 2019-02-25 08:55:25 +01:00
bubnikv
de70b6a06a Removed ExPolygon::triangulate_pp() from Perl XS bindings and unit tests. 2019-01-24 19:22:35 +01:00
bubnikv
90235ac386 Fixed layer height profile access from Perl XS 2019-01-23 15:29:18 +01:00
Vojtech Kral
e8d63f3eb1 Upgrade Boost to 1.66 on Windows 2019-01-16 15:14:18 +01:00
bubnikv
09c539a242 Trigger background processing update when switching to a preview tab. 
Implements "Go Direct to the preview screen after slicing #152"
 2018-12-11 17:49:31 +01:00
bubnikv
e0cf7ecd22 WIP: Command line slicing for SLA. 
Removed some layer height editing bindings from Perl.
 2018-12-11 13:16:09 +01:00
bubnikv
d46d0dc365 Implemented naming of the SLA export file based on the output file name 
template.

Reworked naming of the plater exports to not use the output file name
template, but to derive the file name from the first printable object's name.

Fixed error handling: Reimpemented the Perl's "eval" blocks
as try / catch blocks.
 2018-12-03 13:14:28 +01:00
bubnikv
bde4153d44 Removed legacy GUI Perl bindings, 
replaced Print & SLAPrint pointers with BackgroundProcessing pointer
at the GLCanvas3D level, so that the Print & SLAPrint access will be
synchronized with the current printer technology.
 2018-11-22 15:29:59 +01:00
Vojtech Kral
b950e9e575 Fix build 2018-11-19 11:39:17 +01:00
tamasmeszaros
a4e1ab2281 Getting rid of AppController. 2018-11-12 15:02:42 +01:00
bubnikv
c2e46350f2 Separated Print / PrintObject into PrintBase.cpp/h to support SLAPrint 2018-11-08 14:23:17 +01:00
bubnikv
3eea327ef0 WIP: When iterating over PrintObject's regions, use the region count 
by PrintObject::region_volumes. This is due to the way Print::apply()
works, it does not invalidate an existing PrintObject if a new region
is added to the print.
 2018-11-06 15:31:26 +01:00
bubnikv
7ffa22191d Fixed some issues with front end / back end synchronization. 2018-11-05 17:52:55 +01:00
bubnikv
cf5dcfa9ed ModelBase ID refactoring, starting to work. 
Now it remains to clean up some of the no more used Model interfaces.
 2018-11-02 19:49:40 +01:00
bubnikv
56633c7449 Reverted Print::export_png() for the Perl unit tests. 2018-10-24 13:59:24 +02:00
bubnikv
bded28f888 WIP: Reconstruction of background processing. 2018-10-23 15:27:31 +02:00
bubnikv
857863102d Merge branch 'dev_native' into vb_dev_native_background_processing 2018-10-18 18:03:17 +02:00
bubnikv
7ed2752b2b WIP: Reconstruction of background processing update timer, 
added unique IDs to the Model / ModelObject / ModelVolume objects,
added a copy of Model hierarchy at the Print,
WIP: new Print::apply() method to update the Print's copy of Model,
to update the Print's PrintObjects, to update status of the Print and
PrintObjects, and to possibly stop the background processing.
 2018-10-17 11:12:38 +02:00
Enrico Turri
059ab4a05c ModelInstance's full 3D transform set as default 2018-10-16 09:51:30 +02:00
bubnikv
6260e43f61 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-25 15:33:51 +02:00
bubnikv
9a3db200a5 Updated AMF/3MF import to pass configuration into a DynamicPrintConfig 
instead of PresetBundle.
 2018-09-25 11:53:05 +02:00
Enrico Turri
a651f5f5d7 ModelInstance full 3D transform code moved into a single technology 2018-09-25 10:42:11 +02:00
Enrico Turri
0e1843a871 1st installment of ModelInstance 3D scale components 2018-09-24 15:54:09 +02:00
Enrico Turri
e3d44b07fe Fixed arrange for objects with 3D rotations 2018-09-24 15:21:18 +02:00
bubnikv
20d0f046d2 Merge remote-tracking branch 'origin/dev2' into dev_native 2018-09-20 16:48:40 +02:00
bubnikv
add45a8f6e Added C++ command line processing, thanks @alexrj and @loh 2018-09-20 16:48:13 +02:00
Enrico Turri
07274589a3 1st installment of ModelInstance 3D rotation components 2018-09-20 15:00:40 +02:00
tamasmeszaros
2306c1589a Polymorphic AppController for cli and gui modes. 2018-09-19 18:02:04 +02:00
Enrico Turri
e3e5948982 1st installment of preview ported in c++ 2018-09-18 13:35:05 +02:00
bubnikv
fe3b92870f Merged with dev 2018-09-17 15:12:13 +02:00
bubnikv
d934b63424 Removed Print.pm, 
ported execution of post processing scripts into C++ (WIP, waits for
update of boost::system module on our build server)
Removed other mention of the "Controller".
 2018-09-17 12:01:02 +02:00
bubnikv
2c9dc4dbbf Finished porting of the status bar to C++. 2018-09-14 10:59:50 +02:00
bubnikv
36faa090fc Removed the Controller, Layer View, System Info, ObjectCutDialog, 
removed unused Perl modules.
 2018-09-14 10:25:20 +02:00
bubnikv
9d9e4a0f7b WIP: Background processing. 2018-09-14 09:28:00 +02:00
bubnikv
bb70ad6090 Removed Strings.hpp, replaced with wxString 
Fixed UTF8 rendering of status messages.
 2018-09-12 13:17:47 +02:00
bubnikv
0235f1a821 Merged with dev 2018-09-12 11:59:02 +02:00
bubnikv
41ce69f327 Improved constness of the Print / PrintObject / Layer ... 
Split the wipe tower and time statistics data into separate objects.
Initial work in synchronizing the Model with the Print.
 2018-09-11 14:04:47 +02:00
Enrico Turri
781df150a1 Added perl callback for gizmo flatten 2018-09-10 14:10:08 +02:00
Enrico Turri
8460926d36 Added select by part tool to toolbar 2018-09-06 16:10:31 +02:00
Enrico Turri
677dad0669 Object's properties updated while manipulating gizmos 2018-09-05 16:22:48 +02:00
Enrico Turri
87c5c8e7f6 Renamed GLVolume member variables to match the corresponding ModelInstance ones 2018-09-05 09:11:58 +02:00
tamasmeszaros
4f53fc2a5f Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev 
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp
 2018-08-30 17:35:49 +02:00
tamasmeszaros
15ad0ef2f2 working C++ status bar. 
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
 2018-08-30 11:55:10 +02:00
tamasmeszaros
9e2d48ff3b Almost working c++ status bar 
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
 2018-08-30 11:54:08 +02:00
YuSanka
6c1b52afa2 Deleted "scale" column from object list 2018-08-29 13:11:30 +02:00
tamasmeszaros
1c4574d42e fix centroid error for two points and merge with dev. 2018-08-27 16:20:13 +02:00
Enrico Turri
4b25d3924b Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri
fef5a5252e Fixed conflicts after merging with master 2018-08-27 14:00:53 +02:00
tamasmeszaros
d749080261 Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-27 09:53:52 +02:00
YuSanka
02a325556d Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 16:28:34 +02:00
Enrico Turri
cda135ada7 Removed scale and rotate actions from toolbar 2018-08-24 15:08:19 +02:00
YuSanka
8b148a4fe4 Merge remote-tracking branch 'origin/new_main_page_ui' into dev 2018-08-24 15:01:26 +02:00
YuSanka
ada6970053 Merge remote-tracking branch 'origin/SLA_ui' into dev 2018-08-24 12:20:24 +02:00
Enrico Turri
66ce638439 Fixed conflicts after merging with branch eigenize 2018-08-23 15:37:38 +02:00
Enrico Turri
a5fcdeec23 Merge branch 'gizmos_3d' of https://github.com/prusa3d/Slic3r into dev 2018-08-23 09:45:04 +02:00
bubnikv
6829704475 d .. 2018-08-22 15:03:35 +02:00
Lukas Matena
85ae2d0d2f Merge branch 'master' into lm_lay_flat_round_merged_facets 2018-08-22 14:03:17 +02:00
bubnikv
ac72cd779f Replaced Point3 with Eigen Vec3crd, removed Point3 from the Perl binding. 2018-08-21 22:14:47 +02:00
bubnikv
0b5b02e002 Eradicated the Pointf class, replaced with Eigen Vector3d 2018-08-21 21:05:24 +02:00
bubnikv
cae0806112 Eradicated most of Pointf extras compared to pure Eigen::Vector2d. 2018-08-21 20:34:45 +02:00
bubnikv
cb138a20b8 Completely replaced the homebrew Pointf3 class with Eigen Vec3d. 
Replaced the unscale macro with a template, implemented templates
for unscaling Eigen vectors.
 2018-08-21 17:43:05 +02:00
Vojtech Kral
0c984c7584 Print host bugfixes / refactoring 2018-08-21 15:47:29 +02:00
Lukas Matena
86b67bbd42 Lay flat - rotation is now done in one go directly about the necessary axis 2018-08-21 15:40:11 +02:00
tamasmeszaros
6e77307880 Merge remote-tracking branch 'origin/eigenize' into sla_base_pool 2018-08-21 13:50:09 +02:00
Martin Loidl
dd1fd66a47 Added possibility for upload to Duet 
Further changes:
- Added new configuration option Host Type
- Added abstract base class for future printer hosts
- Moved location of upload dialog (also made it a little bit more configureable)
- added possibility to send file via postfield instead a new frame
 2018-08-21 11:12:53 +02:00
bubnikv
c5256bdd2c Removed the Point::coincides_with_epsilon() method 2018-08-21 09:51:22 +02:00
bubnikv
ab60d8adb4 Replaced coincides_with(const Line &line) with operator== 2018-08-17 18:27:07 +02:00
bubnikv
9e7634b6e8 Merged with master 2018-08-17 18:07:45 +02:00
bubnikv
5b94f53cd7 Removed the Point::wkt() and Point::dump_perl() methods. 
Added to_string() for the basis Eigen vector types.
 2018-08-17 16:54:07 +02:00
bubnikv
65011f9382 Removed the x(), y(), z() Point/Pointf/Point3/Pointf3 accessors. 2018-08-17 15:53:43 +02:00
bubnikv
1ba64da3fe Removed Point::scale(),translate(),coincides_with(),distance_to(), 
distance_to_squared(),perp_distance_to(),negative(),vector_to(),
translate(), distance_to() etc,
replaced with the Eigen equivalents.
 2018-08-17 14:14:24 +02:00
Enrico Turri
da42b42a6c Merge branch 'opengl_to_cpp' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-15 14:39:40 +02:00
bubnikv
3b89717149 Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types: 
Changed the Point3 / Pointf3 to derive from the Eigen Vec3crd / Vec3d.
Replaced the Point::concide_with() method calls with == operator.
Reduced some compiler warnings.
 2018-08-15 13:51:40 +02:00
Enrico Turri
4d98d32199 Use of bounding box of rotated 3D convex hull for out of print volume detection 2018-08-15 12:50:06 +02:00
bubnikv
86da661097 Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types, first step 2018-08-14 18:33:26 +02:00
Enrico Turri
b6f6200bd5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-08-13 08:51:58 +02:00
tamasmeszaros
5164bec8ce Merge remote-tracking branch 'origin/master' into feature_slice_to_png 
# Conflicts:
#	xs/CMakeLists.txt
 2018-08-09 10:53:27 +02:00
YuSanka
adf003f0ed Correct preset/tabs updating according to the technology 
+ some code refactoring
 2018-08-08 16:22:56 +02:00
bubnikv
ea163edc41 Deregister the update callback on end of the application. 
This fixes a crash on exit.
 2018-08-05 23:36:25 +02:00
Lukas Matena
f694600054 Merge branch 'lm_wipe_tower_block_improvements' into lm_wipe_tower_block_improvements_merged 2018-08-02 13:29:39 +02:00
Lukas Matena
7683870350 New perl callback to force reloading of 3d scene after Purging volumes are changed 
After the changes in previous commit, the 3D scene must be reloaded after the wipe tower
is invalidated. This can mostly be done on the C++ side, but reloading after Purging volumes
are changed required this C++ -> Perl call
 2018-08-02 11:04:47 +02:00
Lukas Matena
d5f042b4b8 Wipe tower postprocessing, wipe tower block on 3D plate improved. 
- it renders red with one egde as indeterminate, the front edge is where the wipe tower will start
- changing width changes depth of the block (as requested)
- the block shows the brim of the wipe tower
- after slicing, the block is rendered in usual dark green and takes the exact shape of the tower (also with brim)
- moving or rotationg the block after slicing does not invalidate the wipe tower (and hence the exact block dimensions are preserved)
- changing anything that invalidates the wipe tower reverts the block back to the "indeterminate" shape
- the block is not shown after slicing, if the wipe tower is not actually generated (printing single color object with the wipe tower enabled)

This required changes in the wipe tower generator, which now generates the tower
at origin with no rotation. Resulting gcode is postprocessed and transformed during
gcode export. This means the wipe tower needs not be invalidated when it is moved or rotated.
 2018-08-02 11:04:04 +02:00
bubnikv
4e193555ae Adding the SLA printer profiles, WIP 2018-08-01 11:09:51 +02:00
YuSanka
c2993de6e0 Scale and rotation from scene to value updates correctly 2018-07-29 21:42:57 +02:00
Enrico Turri
590773d77b Fixed conflict after merge with master 2018-07-27 12:15:35 +02:00
Enrico Turri
ddda5062c2 3D scene toolbar actions 2018-07-27 12:08:33 +02:00
Enrico Turri
3a1ec8285e Reddish background when detected out of print volume toolpaths 2018-07-27 09:38:39 +02:00
YuSanka
e0bb6bafd5 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-07-26 11:27:25 +02:00
YuSanka
da18e25dfb Added callback for 3dScene updating after extruder changing 2018-07-26 10:59:03 +02:00
tamasmeszaros
93ae3a0f1a Flip Y changed back to BOTTOM_LEFT 
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
 2018-07-25 17:27:02 +02:00
Enrico Turri
d4adcd4077 Out of print volume detection for toolpaths 2018-07-24 13:39:17 +02:00
YuSanka
97a25cf608 Work with model objects like reference (from/to perl side) 2018-07-24 12:15:36 +02:00
Enrico Turri
8bf3e63f75 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 11:20:02 +02:00
Enrico Turri
c68bcb9e60 1st installment of 3D scene toolbar 2018-07-23 13:49:48 +02:00
Enrico Turri
df36de0d35 Fixed status of Slice now and Export G-Code buttons after object import 2018-07-23 10:16:56 +02:00
Enrico Turri
4579b71a66 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:07:56 +02:00
Enrico Turri
3fac0d92cd Unified opengl textures 2018-07-18 15:07:52 +02:00
Enrico Turri
d805c8ac3b Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
tamasmeszaros
9559ad77e5 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-18 10:14:28 +02:00
Enrico Turri
5c90746914 Merge with master + resolved conflicts 2018-07-17 10:44:23 +02:00
bubnikv
83f9813f56 Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
Enrico Turri
8175c9d306 Merge with master 2018-07-17 08:54:17 +02:00
bubnikv
210eeff160 Merge remote-tracking branch 'remotes/origin/amf_activate_existing_presets' 2018-07-16 19:52:17 +02:00
YuSanka
54298c8e61 First right-panel reorganization: 
* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list
 2018-07-04 09:03:43 +02:00
bubnikv
6b3c24359b Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
tamasmeszaros
85474e5803 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 
# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-28 18:50:39 +02:00
tamasmeszaros
ad4d95f60c AppController integration 2018-06-28 18:47:18 +02:00
tamasmeszaros
d337b69407 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 17:44:33 +02:00
tamasmeszaros
ac9d81cfa0 Refactor and extensions to png export dialog. 2018-06-27 17:43:54 +02:00
Enrico Turri
7ff22b9413 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
3dba0be81e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Enrico Turri
d02c90d5d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Chow Loong Jin
8eb8a8b1f6 Fix format-security violation with croak 
Missed one in https://github.com/prusa3d/slic3r/pull/802.
 2018-06-27 13:54:07 +02:00
Enrico Turri
48915a65fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
8db4fdc24c 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
5c32347449 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
bubnikv
68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
tamasmeszaros
c28b602465 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
tamasmeszaros
d2c6190cc5 Comments and refactoring 2018-06-26 17:02:46 +02:00
Enrico Turri
ab587babb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
9b2f760679 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
Enrico Turri
a754de4c32 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
YuSanka
0371f368a4 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
tamasmeszaros
3efe6675cb Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-25 17:14:29 +02:00
Enrico Turri
714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
7b0ba7a9d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
40b327eb11 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
tamasmeszaros
f26cb9ebd6 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
 2018-06-25 13:24:37 +02:00
Enrico Turri
f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri
ac0f3a6ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00