fix for carve memory leak, update carve to hg bf36d92ff093
[blender.git] / extern / carve / patches / strict_flags.patch
1 diff -r 47dfdaff1dd5 include/carve/csg_triangulator.hpp
2 --- a/include/carve/csg_triangulator.hpp        Thu Jan 12 15:49:04 2012 -0500
3 +++ b/include/carve/csg_triangulator.hpp        Fri Jan 13 03:13:32 2012 +0600
4 @@ -174,6 +174,7 @@
5  
6        double scoreQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
7          if (!(*i).second.first || !(*i).second.second) return -1;
8 +        return 0;
9        }
10  
11        carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
12 diff -r 47dfdaff1dd5 lib/selfintersect.cpp
13 --- a/lib/selfintersect.cpp     Thu Jan 12 15:49:04 2012 -0500
14 +++ b/lib/selfintersect.cpp     Fri Jan 13 03:13:32 2012 +0600
15 @@ -465,6 +465,7 @@
16  
17  // returns true if no intersection, based upon edge^a_i and edge^b_j separating axis.
18  bool sat_edge(const vec3 tri_a[3], const vec3 tri_b[3], unsigned i, unsigned j) {
19 +  return false;
20  }
21  
22