Fixed conflicts after merging with master

This commit is contained in:
Enrico Turri 2018-08-27 14:00:53 +02:00
commit fef5a5252e
38 changed files with 835 additions and 126 deletions

View file

@ -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)