[Bf-blender-cvs] [7fb7ce7] master: Fix T38631: Blender crashes when selection faces after new boolean modifier

[Sergey Sharybin]

Commit: 7fb7ce789f803749021e8d2468f35e31783c21b1
Author: Sergey Sharybin
Date:   Fri Feb 14 14:25:43 2014 +0600
https://developer.blender.org/rB7fb7ce789f803749021e8d2468f35e31783c21b1

Fix T38631: Blender crashes when selection faces after new boolean modifier

Own mistake in edges carve->blender export, didn't count them correct.

===================================================================

M	extern/carve/carve-capi.cc

===================================================================

diff --git a/extern/carve/carve-capi.cc b/extern/carve/carve-capi.cc
index 7478c34..aaf5761 100644
--- a/extern/carve/carve-capi.cc
+++ b/extern/carve/carve-capi.cc
@@ -522,7 +522,6 @@ void carve_exportMesh(CarveMeshDescr *mesh_descr,
 	std::unordered_map<VertexPair, int> edge_map;
 	for (int i = 0, edge_index = 0; i < poly->meshes.size(); ++i) {
 		carve::mesh::Mesh<3> *mesh = poly->meshes[i];
-
 		// Export closed edges.
 		exportMesh_handle_edges_list(poly,
 		                             mesh->closed_edges,
@@ -531,6 +530,7 @@ void carve_exportMesh(CarveMeshDescr *mesh_descr,
 		                             export_data,
 		                             edge_origindex_map,
 		                             &edge_map);
+		edge_index += mesh->closed_edges.size();
 
 		// Export open edges.
 		exportMesh_handle_edges_list(poly,
@@ -540,8 +540,7 @@ void carve_exportMesh(CarveMeshDescr *mesh_descr,
 		                             export_data,
 		                             edge_origindex_map,
 		                             &edge_map);
-
-		edge_index += mesh->closed_edges.size();
+		edge_index += mesh->open_edges.size();
 	}
 
 	// Export all the loops and polys.