Forgot the #ifdefs for the Havok enabled version, so setCount of llstrider is only called on non Havok builds.
parent
2c4d38d394
commit
af17cbce9f
|
|
@ -1907,11 +1907,11 @@ void LLRender::flush()
|
|||
mBuffer->getTexCoord0Strider(mTexcoordsp, 0, count);
|
||||
mBuffer->getColorStrider(mColorsp, 0, count);
|
||||
|
||||
// <FS:ND> protect against buffer overflows
|
||||
#ifdef OPENSIM // <FS:ND> protect against buffer overflows
|
||||
mVerticesp.setCount( mBuffer->getNumVerts() );
|
||||
mTexcoordsp.setCount( mBuffer->getNumVerts() );
|
||||
mColorsp.setCount( mBuffer->getNumVerts() );
|
||||
// </FS:ND>
|
||||
#endif // </FS:ND>
|
||||
}
|
||||
|
||||
mBuffer->flush();
|
||||
|
|
|
|||
|
|
@ -2057,11 +2057,11 @@ template <class T,S32 type> struct VertexBufferStrider
|
|||
strider = (T*)ptr;
|
||||
strider.setStride(0);
|
||||
|
||||
// <FS:ND> protect against buffer overflows
|
||||
#ifdef OPENSIM // <FS:ND> protect against buffer overflows
|
||||
if( count == -1 )
|
||||
count = vbo.getNumIndices()-index;
|
||||
strider.setCount( count );
|
||||
// <FS:ND>
|
||||
#endif // <FS:ND>
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -2080,11 +2080,11 @@ template <class T,S32 type> struct VertexBufferStrider
|
|||
strider = (T*)ptr;
|
||||
strider.setStride(stride);
|
||||
|
||||
// <FS:ND> protect against buffer overflows
|
||||
#ifdef OPENSIM // <FS:ND> protect against buffer overflows
|
||||
if( count == -1 )
|
||||
count = vbo.getNumVerts()-index;
|
||||
strider.setCount( count );
|
||||
// <FS:ND>
|
||||
#endif // <FS:ND>
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -834,11 +834,11 @@ void LLImagePreviewSculpted::setPreviewTarget(LLImageRaw* imagep, F32 distance)
|
|||
LLStrider<LLVector2> tc;
|
||||
tc = (LLVector2*) vf.mTexCoords; tc.setStride(8);
|
||||
|
||||
// <FS:ND> protect against buffer overflows
|
||||
#ifdef OPENSIM // <FS:ND> protect against buffer overflows
|
||||
pos.setCount( vf.mNumVertices );
|
||||
norm.setCount( vf.mNumVertices );
|
||||
tc.setCount( vf.mNumVertices );
|
||||
// </FS:ND>
|
||||
#endif // </FS:ND>
|
||||
|
||||
for (U32 i = 0; i < num_vertices; i++)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue