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

Merge with master branch

Browse source
This commit is contained in:
Enrico Turri 2018-05-09 10:16:28 +02:00
commit bd4061c3b0
8 changed files with 72 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/xsp/Model.xsp
View file

@ -95,7 +95,7 @@
void duplicate_objects_grid(unsigned int x, unsigned int y, double dist);
bool looks_like_multipart_object() const;
void convert_multipart_object();
void convert_multipart_object(unsigned int max_extruders);
void print_info() const;
@ -343,7 +343,7 @@ ModelMaterial::attributes()
void set_modifier(bool modifier)
%code%{ THIS->modifier = modifier; %};
size_t split();
size_t split(unsigned int max_extruders);
ModelMaterial* assign_unique_material();
};