TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/style-cleanup' into development

Browse source 
Conflicts:
	Engine/source/T3D/tsStatic.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/ts/tsMesh.cpp
	Engine/source/ts/tsShape.cpp
This commit is contained in:
Daniel Buckmaster 2015-03-01 22:30:22 +11:00
commit 33fcc59543
62 changed files with 3380 additions and 3381 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/shapeImage.cpp
View file

@ -497,9 +497,9 @@ bool ShapeBaseImageData::preload(bool server, String &errorStr)
do {
MatrixF nmat;
QuatF q;
TSTransform::setMatrix(shape[i]->defaultRotations[node].getQuatF(&q),shape[i]->defaultTranslations[node],&nmat);
TSTransform::setMatrix(shape[i]->mDefaultRotations[node].getQuatF(&q),shape[i]->mDefaultTranslations[node],&nmat);
total.mul(nmat);
node = shape[i]->nodes[node].parentIndex;
node = shape[i]->mNodes[node].parentIndex;
}
while(node != -1);
total.inverse();