TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 22:54:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #795 from BeamNG/T3D_x64

Browse source 
Support for Windows x64 builds
This commit is contained in:
LuisAntonRebollo 2014-10-02 01:31:07 +02:00
commit 42386b3f6f
170 changed files with 28269 additions and 29291 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/ts/tsShape.cpp
View file

@ -1170,7 +1170,10 @@ void TSShape::assembleShape()
skip = true;
TSMesh * mesh = TSMesh::assembleMesh(meshType,skip);
if (ptr32)
{
ptr32[i] = skip ? 0 : (S32)mesh;
meshes.push_back(skip ? 0 : mesh);
}
// fill in location of verts, tverts, and normals for detail levels
if (mesh && meshType!=TSMesh::DecalMeshType)
@ -1198,7 +1201,6 @@ void TSShape::assembleShape()
}
}
}
meshes.set(ptr32,numMeshes);
tsalloc.checkGuard();