Commit d63b820e authored by Andy's avatar Andy

More fixes

 - check for an empty shapName, not just a NULL one twice
 - fix "&s" in printf
 - fix potential memory leak
 - GFXCopyPixels wasn't checking the height properly which could result in some meory corruption unpleasantness
parent 65099897
......@@ -527,7 +527,7 @@ bool PxMultiActorData::preload( bool server, String &errorBuffer )
return false;
}
if (!shapeName || shapeName == '\0')
if (!shapeName || shapeName[0] == '\0')
{
errorBuffer = "PxMultiActorDatas::preload: no shape name!";
return false;
......
......@@ -1074,7 +1074,7 @@ void MeshRoad::unpackUpdate(NetConnection * con, BitStream * stream)
stream->read( &mMaterialName[i] );
if ( !Sim::findObject( mMaterialName[i], pMat ) )
Con::printf( "DecalRoad::unpackUpdate, failed to find Material of name &s!", mMaterialName[i].c_str() );
Con::printf( "DecalRoad::unpackUpdate, failed to find Material of name %s", mMaterialName[i].c_str() );
else
mMaterial[i] = pMat;
}
......
......@@ -400,7 +400,11 @@ void SkyBox::_initRender()
}
GFXVertexPNTT *vertPtr = mVB.lock();
if(!vertPtr) return;
if (!vertPtr)
{
delete[] tmpVerts;
return;
}
dMemcpy( vertPtr, tmpVerts, sizeof ( GFXVertexPNTT ) * vertCount );
......
......@@ -81,7 +81,7 @@ void GFXCopyPixels( GFXFormat fromFormat, U32 fromWidth, U32 fromHeight, U8* fr
{
if( fromFormat == toFormat
&& fromWidth == toWidth
&& fromHeight == fromHeight )
&& fromHeight == toHeight )
dMemcpy( toData, fromData, fromWidth * fromHeight * GFXFormatInfo( fromFormat ).getBytesPerPixel() );
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment