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

This commit is contained in:
Enrico Turri committed 2018-02-05 13:28:10 +01:00
commit 593d794655
7 files changed
+75 -68

No files matched your search

+2 -2
View File
@@ -18,8 +18,8 @@
bool is_compatible_with_printer(Preset *active_printer)
%code%{ RETVAL = THIS->is_compatible_with_printer(*active_printer); %};
const char* name() %code%{ RETVAL = THIS->name.c_str(); %};
const char* file() %code%{ RETVAL = THIS->file.c_str(); %};
std::string name() %code%{ RETVAL = THIS->name; %};
std::string file() %code%{ RETVAL = THIS->file; %};
bool loaded() %code%{ RETVAL = THIS->loaded; %};