[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36263] trunk/blender/source/blender/ blenkernel/intern: fix [#27096] Segmentation Fault trying to export DirectX with specific model
Campbell Barton
ideasman42 at gmail.com
Thu Apr 21 11:03:04 CEST 2011
Revision: 36263
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36263
Author: campbellbarton
Date: 2011-04-21 09:03:04 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
fix [#27096] Segmentation Fault trying to export DirectX with specific model
copying a mesh in editmode didnt NULL the edit_mesh pointer.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/particle.c
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-04-21 08:55:10 UTC (rev 36262)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-04-21 09:03:04 UTC (rev 36263)
@@ -236,6 +236,8 @@
}
men->mselect= NULL;
+ men->edit_mesh= NULL;
+ men->pv= NULL; /* looks like this is no-longer supported but NULL just incase */
men->bb= MEM_dupallocN(men->bb);
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2011-04-21 08:55:10 UTC (rev 36262)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2011-04-21 09:03:04 UTC (rev 36263)
@@ -264,7 +264,6 @@
int psys_check_enabled(Object *ob, ParticleSystem *psys)
{
ParticleSystemModifierData *psmd;
- Mesh *me;
if(psys->flag & PSYS_DISABLED || psys->flag & PSYS_DELETE || !psys->part)
return 0;
More information about the Bf-blender-cvs
mailing list