Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix the bug that caused the shape exporter to crash

Browse source
This commit is contained in:
kaetemi 2014-02-09 22:12:44 +01:00
parent aaad67a5e5
commit ad40eb6450
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/nel/src/3d/mesh_multi_lod.cpp
View file

@ -791,17 +791,20 @@ void CMeshMultiLod::compileCoarseMeshes()
{
slotRef.CoarseTriangles.resize(slotRef.CoarseNumTris * 3);
TCoarseMeshIndexType *dstPtr= &slotRef.CoarseTriangles[0];
uint totalTris = 0;
for(uint i=0;i<meshGeom->getNbRdrPass(0);i++)
{
const CIndexBuffer &pb= meshGeom->getRdrPassPrimitiveBlock(0, i);
CIndexBufferRead ibaRead;
pb.lock (ibaRead);
uint numTris= pb.getNumIndexes()/3;
totalTris += numTris;
if (pb.getFormat() == CIndexBuffer::Indices16)
{
if (sizeof(TCoarseMeshIndexType) == sizeof(uint16))
{
memcpy(dstPtr, (uint16 *) ibaRead.getPtr(), numTris*3*sizeof(uint16));
dstPtr+= numTris*3;
}
else
{
@ -820,6 +823,7 @@ void CMeshMultiLod::compileCoarseMeshes()
if (sizeof(TCoarseMeshIndexType) == sizeof(uint32))
{
memcpy(dstPtr, (uint32 *) ibaRead.getPtr(), numTris*3*sizeof(uint32));
dstPtr+= numTris*3;
}
else
{
@ -836,8 +840,8 @@ void CMeshMultiLod::compileCoarseMeshes()
}
}
}
dstPtr+= numTris*3;
}
nlassert(totalTris == slotRef.CoarseNumTris);
}
}
}

2
code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
View file

@ -142,7 +142,7 @@ bool CNelExport::exportMesh (const char *sPath, INode& node, TimeValue time)
{
bool tempBRet = bRet;
bRet = false;
// delete pShape; // FIXME: there is a delete bug with CMeshMultiLod exported from max!!!
delete pShape;
bRet = tempBRet;
}
catch (...)