fix for carve memory leak, update carve to hg bf36d92ff093
[blender.git] / extern / carve / include / carve / csg.hpp
index db32273a33ce3c0da90d30b28255b983d0eba562..b098cd86cef3e3946c907acda55001e767b023b2 100644 (file)
@@ -174,34 +174,34 @@ namespace carve {
 
       void groupIntersections();
 
-      void _generateVertexVertexIntersections(carve::mesh::MeshSet<3>::vertex_t *va,
-                                              carve::mesh::MeshSet<3>::edge_t *eb);
-      void generateVertexVertexIntersections(carve::mesh::MeshSet<3>::face_t *a,
-                                             const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
-
-      void _generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::vertex_t *va,
-                                            carve::mesh::MeshSet<3>::edge_t *eb);
-      void generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a,
-                                           const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
-
-      void _generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::edge_t *ea,
-                                          carve::mesh::MeshSet<3>::edge_t *eb);
-      void generateEdgeEdgeIntersections(carve::mesh::MeshSet<3>::face_t *a,
-                                         const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
-
-      void _generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa,
-                                            carve::mesh::MeshSet<3>::edge_t *eb);
-      void generateVertexFaceIntersections(carve::mesh::MeshSet<3>::face_t *a,
-                                           const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
-
-      void _generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *fa,
-                                          carve::mesh::MeshSet<3>::edge_t *eb);
-      void generateEdgeFaceIntersections(carve::mesh::MeshSet<3>::face_t *a,
-                                         const std::vector<carve::mesh::MeshSet<3>::face_t *> &b);
-
-      void generateIntersectionCandidates(carve::mesh::MeshSet<3> *a,
+      void _generateVertexVertexIntersections(meshset_t::vertex_t *va,
+                                              meshset_t::edge_t *eb);
+      void generateVertexVertexIntersections(meshset_t::face_t *a,
+                                             const std::vector<meshset_t::face_t *> &b);
+
+      void _generateVertexEdgeIntersections(meshset_t::vertex_t *va,
+                                            meshset_t::edge_t *eb);
+      void generateVertexEdgeIntersections(meshset_t::face_t *a,
+                                           const std::vector<meshset_t::face_t *> &b);
+
+      void _generateEdgeEdgeIntersections(meshset_t::edge_t *ea,
+                                          meshset_t::edge_t *eb);
+      void generateEdgeEdgeIntersections(meshset_t::face_t *a,
+                                         const std::vector<meshset_t::face_t *> &b);
+
+      void _generateVertexFaceIntersections(meshset_t::face_t *fa,
+                                            meshset_t::edge_t *eb);
+      void generateVertexFaceIntersections(meshset_t::face_t *a,
+                                           const std::vector<meshset_t::face_t *> &b);
+
+      void _generateEdgeFaceIntersections(meshset_t::face_t *fa,
+                                          meshset_t::edge_t *eb);
+      void generateEdgeFaceIntersections(meshset_t::face_t *a,
+                                         const std::vector<meshset_t::face_t *> &b);
+
+      void generateIntersectionCandidates(meshset_t *a,
                                           const face_rtree_t *a_node,
-                                          carve::mesh::MeshSet<3> *b,
+                                          meshset_t *b,
                                           const face_rtree_t *b_node,
                                           face_pairs_t &face_pairs,
                                           bool descend_a = true);
@@ -287,7 +287,7 @@ namespace carve {
        * @param[out] out_loops A list of grouped face loops.
        */
       void groupFaceLoops(
-        carve::mesh::MeshSet<3> *src,
+        meshset_t *src,
         FaceLoopList &face_loops,
         const detail::LoopEdges &loop_edges,
         const V2Set &no_cross,