[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11481] trunk/blender/intern/bsp/intern/ BSP_CSGMesh_CFIterator.h: Tools

[Ken Hughes]

Revision: 11481
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11481
Author:   khughes
Date:     2007-08-03 23:34:13 +0200 (Fri, 03 Aug 2007)

Log Message:
-----------
Tools
-----
Bugfixes for #6816 and #6988: Under Windows, Blender would crash if boolean
operations were done on objects which resulted in an empty mesh.  Problem was
"iterators" created for ConvertCSGDescriptorsToDerivedMesh() tried to access
invalid memory.

Modified Paths:
--------------
    trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h

Modified: trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
===================================================================
--- trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h	2007-08-03 16:33:08 UTC (rev 11480)
+++ trunk/blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h	2007-08-03 21:34:13 UTC (rev 11481)
@@ -125,7 +125,8 @@
 	
 	BSP_CSGMesh_VertexIt * v_it = new BSP_CSGMesh_VertexIt;
 	v_it->mesh = mesh;
-	v_it->pos = &mesh->VertexSet()[0];
+	if( output->num_elements > 0 )
+		v_it->pos = &mesh->VertexSet()[0];
 	output->it = v_it;
 };			
 
@@ -257,11 +258,11 @@
 	
 	BSP_CSGMesh_FaceIt * f_it = new BSP_CSGMesh_FaceIt;
 	f_it->mesh = mesh;
-	f_it->pos = &mesh->FaceSet()[0];
+	if( output->num_elements > 0 )
+		f_it->pos = &mesh->FaceSet()[0];
 	f_it->face_triangle = 0;
 
 	output->it = f_it;
-
 };