mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 19:33:47 +00:00
Fixed conflicts after merging with master
This commit is contained in:
@@ -301,7 +301,8 @@ ModelMaterial::attributes()
|
||||
void translate(double x, double y, double z);
|
||||
void scale_xyz(Vec3d* versor)
|
||||
%code{% THIS->scale(*versor); %};
|
||||
void rotate(float angle, Axis axis);
|
||||
void rotate(float angle, Vec3d* axis)
|
||||
%code{% THIS->rotate(angle, *axis); %};
|
||||
void mirror(Axis axis);
|
||||
|
||||
Model* cut(double z)
|
||||
|
||||
Reference in New Issue
Block a user