Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-04-10 17:10:44 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-10 17:10:44 +0400
commit5061f2eb62e1e940d83636dda7584b06c5e8166d (patch)
tree71597fb60652361e20c4155cdb723dd20163b5bf /source/gameengine/Converter
parent1b74ec9564cb6edf83f5fd8811c67f019fc9f25c (diff)
fix [#30839] Blender crashes while open/close a scene and deletes .blend-file
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index a49a84a327d..e112537d0f6 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -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;
}