[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45506] trunk/blender/source/gameengine: fix [#30839] Blender crashes while open/close a scene and deletes . blend-file
Campbell Barton
ideasman42 at gmail.com
Tue Apr 10 15:10:44 CEST 2012
Revision: 45506
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45506
Author: campbellbarton
Date: 2012-04-10 13:10:44 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
fix [#30839] Blender crashes while open/close a scene and deletes .blend-file
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Ketsji/BL_Material.cpp
trunk/blender/source/gameengine/Ketsji/BL_Material.h
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2012-04-10 12:35:15 UTC (rev 45505)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2012-04-10 13:10:44 UTC (rev 45506)
@@ -892,7 +892,12 @@
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;
}
Modified: trunk/blender/source/gameengine/Ketsji/BL_Material.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Material.cpp 2012-04-10 12:35:15 UTC (rev 45505)
+++ trunk/blender/source/gameengine/Ketsji/BL_Material.cpp 2012-04-10 13:10:44 UTC (rev 45506)
@@ -58,7 +58,7 @@
alpha = 1.f;
emit = 0.f;
material = 0;
- tface = 0;
+ memset(&tface, 0, sizeof(tface));
materialindex = 0;
amb=0.5f;
num_enabled = 0;
Modified: trunk/blender/source/gameengine/Ketsji/BL_Material.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Material.h 2012-04-10 12:35:15 UTC (rev 45505)
+++ trunk/blender/source/gameengine/Ketsji/BL_Material.h 2012-04-10 13:10:44 UTC (rev 45506)
@@ -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 @@
Material* material;
- MTFace* tface;
+ MTFace tface; /* copy of the derived meshes tface */
Image* img[MAXTEX];
EnvMap* cubemap[MAXTEX];
Modified: trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2012-04-10 12:35:15 UTC (rev 45505)
+++ trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp 2012-04-10 13:10:44 UTC (rev 45506)
@@ -118,8 +118,7 @@
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 @@
/* 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);
}
More information about the Bf-blender-cvs
mailing list