16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 06:59:18 +02:00

Merge branch 'tmj-dev' into nogfx

This commit is contained in:
milek7
2017-08-21 13:16:36 +02:00
13 changed files with 757 additions and 922 deletions

View File

@@ -209,7 +209,6 @@ public:
return m_material; }
void ParentMatrix(float4x4 *m);
float MaxY( float4x4 const &m );
void AdjustDist();
void deserialize(std::istream&);
void serialize(std::ostream&,