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 branch 'development' into EngineAPI-Refactor

Browse source
This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 • committed by GitHub
commit 6cf0c9e360
1933 changed files with 102328 additions and 70545 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/ts/loader/tsShapeLoader.cpp
View file

@ -1172,7 +1172,7 @@ void TSShapeLoader::install()
{
TSMesh *mesh = shape->meshes[obj.startMeshIndex + iMesh];
if (mesh && !mesh->primitives.size())
if (mesh && !mesh->mPrimitives.size())
{
S32 oldMeshCount = obj.numMeshes;
destructInPlace(mesh);
@ -1220,13 +1220,13 @@ void TSShapeLoader::install()
}
}
computeBounds(shape->bounds);
if (!shape->bounds.isValidBox())
shape->bounds = Box3F(1.0f);
computeBounds(shape->mBounds);
if (!shape->mBounds.isValidBox())
shape->mBounds = Box3F(1.0f);
shape->bounds.getCenter(&shape->center);
shape->radius = (shape->bounds.maxExtents - shape->center).len();
shape->tubeRadius = shape->radius;
shape->mBounds.getCenter(&shape->center);
shape->mRadius = (shape->mBounds.maxExtents - shape->center).len();
shape->tubeRadius = shape->mRadius;
shape->init();
shape->finalizeEditable();