eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-19 14:39:18 +02:00
Code Issues 122 Wiki Activity

Merge branch 'nodecloner' into sim

Browse Source
This commit is contained in:
milek7
2019-03-15 01:18:07 +01:00
parent a8809f1852 22261c8e5b
commit 1b508954e7
23 changed files with 396 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Model3d.cpp
View File

@@ -1060,8 +1060,8 @@ void TSubModel::RaAnimation(glm::mat4 &m, TAnimType a)
}
if (mAnimMatrix) // można by to dać np. do at_Translate
{
m *= glm::make_mat4(mAnimMatrix->e);
mAnimMatrix = NULL; // jak animator będzie potrzebował, to ustawi ponownie
m *= glm::make_mat4(mAnimMatrix.get()->e);
mAnimMatrix.reset(); // jak animator będzie potrzebował, to ustawi ponownie
}
};