diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-10 17:10:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-10 17:10:44 +0400 |
| commit | 5061f2eb62e1e940d83636dda7584b06c5e8166d (patch) | |
| tree | 71597fb60652361e20c4155cdb723dd20163b5bf /source/gameengine/Ketsji/KX_BlenderMaterial.cpp | |
| parent | 1b74ec9564cb6edf83f5fd8811c67f019fc9f25c (diff) | |
fix [#30839] Blender crashes while open/close a scene and deletes .blend-file
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp index 13727be8b98..018a8d44cc1 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp @@ -118,8 +118,7 @@ KX_BlenderMaterial::~KX_BlenderMaterial() MTFace* KX_BlenderMaterial::GetMTFace(void) const { // fonts on polys - MT_assert(mMaterial->tface); - return mMaterial->tface; + return &mMaterial->tface; } unsigned int* KX_BlenderMaterial::GetMCol(void) const @@ -238,9 +237,7 @@ void KX_BlenderMaterial::OnExit() /* used to call with 'mMaterial->tface' but this can be a freed array, * see: [#30493], so just call with NULL, this is best since it clears * the 'lastface' pointer in GPU too - campbell */ - if (mMaterial->tface) { - GPU_set_tpage(NULL, 1, mMaterial->alphablend); - } + GPU_set_tpage(NULL, 1, mMaterial->alphablend); } |