ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tried VERY crude work-around for #1938 (crash when exiting a race on osx).

Browse Source
This commit is contained in:
hiker 2015-02-15 21:32:06 +11:00
parent 975aa7628b
commit 1a94788d2d
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/irrlicht/include/SMaterialLayer.h
View File

@ -72,8 +72,15 @@ namespace video
//! Destructor
~SMaterialLayer()
{
MatrixAllocator.destruct(TextureMatrix);
MatrixAllocator.deallocate(TextureMatrix);
#ifdef __APPLE__
// Avoid a crash on osx, where one of the ReadOnlyMaterial
// Texture matrices is -1 - for atm unknown reasons - see #1938
if(TextureMatrix != (core::matrix4*)0xffffffff)
#endif
{
MatrixAllocator.destruct(TextureMatrix);
MatrixAllocator.deallocate(TextureMatrix);
}
}
//! Assignment operator
@ -219,6 +226,7 @@ namespace video
//! Texture Matrix
/** Do not access this element directly as the internal
ressource management has to cope with Null pointers etc. */
public:
core::matrix4* TextureMatrix;
};