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' into updating

Browse source
This commit is contained in:
Vojtech Kral 2018-04-24 18:11:34 +02:00
commit a50bde4267
14 changed files with 280 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/xsp/GUI.xsp
View file

@ -42,7 +42,7 @@ void add_config_menu(SV *ui, int event_preferences_changed, int event_language_c
void create_preset_tabs(bool no_controller, int event_value_change, int event_presets_changed)
%code%{ Slic3r::GUI::create_preset_tabs(no_controller, event_value_change, event_presets_changed); %};
Ref<TabIface> get_preset_tab(char *name)
TabIface* get_preset_tab(char *name)
%code%{ RETVAL=Slic3r::GUI::get_preset_tab_iface(name); %};
bool load_language()

1
xs/xsp/typemap.xspt
View file

@ -213,7 +213,6 @@
%typemap{PresetHints*};
%typemap{Ref<PresetHints>}{simple};
%typemap{TabIface*};
%typemap{Ref<TabIface>}{simple};
%typemap{PrintRegionPtrs*};
%typemap{PrintObjectPtrs*};