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

Fixed: Build error and assert when disabling NL_FORCE_INDEX_BUFFER_16

Browse source
This commit is contained in:
rti 2011-05-26 20:57:23 +02:00
parent 5ab6fb56db
commit 67488d486d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/src/3d/mesh_mrm_skinned.cpp
View file

@ -1867,7 +1867,7 @@ void CMeshMRMSkinnedGeom::updateRawSkinNormal(bool enabled, CMeshMRMSkinnedInst
CIndexBufferReadWrite ibaWrite; CIndexBufferReadWrite ibaWrite;
skinLod.RdrPass[i].lock (ibaWrite); skinLod.RdrPass[i].lock (ibaWrite);
#ifndef NL_SKINNED_MESH_MRM_INDEX16 #ifndef NL_SKINNED_MESH_MRM_INDEX16
nlassert(ibaWrite.getFormat() == CIndexBuffer::Indices32) nlassert(ibaWrite.getFormat() == CIndexBuffer::Indices32);
uint32 *dstTriPtr= (uint32 *) ibaWrite.getPtr(); uint32 *dstTriPtr= (uint32 *) ibaWrite.getPtr();
uint32 numIndices= lod.RdrPass[i].PBlock.size(); uint32 numIndices= lod.RdrPass[i].PBlock.size();
for(uint j=0;j<numIndices;j++, srcTriPtr++, dstTriPtr++) for(uint j=0;j<numIndices;j++, srcTriPtr++, dstTriPtr++)

3
code/nel/src/3d/ps_mesh.cpp
View file

@ -2083,8 +2083,9 @@ static void DuplicatePrimitiveBlock(const CIndexBuffer &srcBlock, CIndexBuffer &
CIndexBufferReadWrite ibaWrite; CIndexBufferReadWrite ibaWrite;
destBlock.lock (ibaWrite); destBlock.lock (ibaWrite);
#ifdef NL_FORCE_INDEX_BUFFER_16
nlassert(destBlock.getFormat() == CIndexBuffer::Indices16); nlassert(destBlock.getFormat() == CIndexBuffer::Indices16);
#endif
// TMP TMP TMP // TMP TMP TMP
if (ibaRead.getFormat() == CIndexBuffer::Indices16) if (ibaRead.getFormat() == CIndexBuffer::Indices16)