bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix [#30839] Blender crashes while open/close a scene and deletes .blend-file

Browse Source
This commit is contained in:
Campbell Barton 2012-04-10 13:10:44 +00:00
parent 1b74ec9564
commit 5061f2eb62
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -892,7 +892,12 @@ bool ConvertMaterial(
if (validmat)
material->matname =(mat->id.name);
material->tface = tface;
if (tface) {
material->tface = *tface;
}
else {
memset(&material->tface, 0, sizeof(material->tface));
}
material->material = mat;
return true;
}

2
source/gameengine/Ketsji/BL_Material.cpp
View File

@ -58,7 +58,7 @@ void BL_Material::Initialize()
alpha = 1.f;
emit = 0.f;
material = 0;
tface = 0;
memset(&tface, 0, sizeof(tface));
materialindex = 0;
amb=0.5f;
num_enabled = 0;

3
source/gameengine/Ketsji/BL_Material.h
View File

@ -8,6 +8,7 @@
#include "STR_String.h"
#include "MT_Point2.h"
#include "DNA_meshdata_types.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
@ -83,7 +84,7 @@ public:
Material* material;
MTFace* tface;
MTFace tface; /* copy of the derived meshes tface */
Image* img[MAXTEX];
EnvMap* cubemap[MAXTEX];

7
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
View File

@ -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);
}