3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-21 15:51:10 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate

Browse source
This commit is contained in:
Enrico Turri 2018-06-27 13:54:39 +02:00
commit d02c90d5d0
10 changed files with 30 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/xsp/GCode.xsp
View file

@ -31,7 +31,7 @@
try {
THIS->do_export(print, path, preview_data);
} catch (std::exception& e) {
croak(e.what());
croak("%s\n", e.what());
}
%};

12
xs/xsp/GUI_3DScene.xsp
View file

@ -190,18 +190,6 @@ remove_all_canvases()
CODE:
_3DScene::remove_all_canvases();
void
reset_current_canvas()
CODE:
_3DScene::reset_current_canvas();
void
set_active(canvas, active)
SV *canvas;
bool active;
CODE:
_3DScene::set_active((wxGLCanvas*)wxPli_sv_2_object(aTHX_ canvas, "Wx::GLCanvas"), active);
void
set_as_dirty(canvas)
SV *canvas;