forked from bartvdbraak/blender
23 lines
866 B
Diff
23 lines
866 B
Diff
diff -r 47dfdaff1dd5 include/carve/csg_triangulator.hpp
|
|
--- a/include/carve/csg_triangulator.hpp Thu Jan 12 15:49:04 2012 -0500
|
|
+++ b/include/carve/csg_triangulator.hpp Fri Jan 13 03:13:32 2012 +0600
|
|
@@ -174,6 +174,7 @@
|
|
|
|
double scoreQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
|
|
if (!(*i).second.first || !(*i).second.second) return -1;
|
|
+ return 0;
|
|
}
|
|
|
|
carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
|
|
diff -r 47dfdaff1dd5 src/selfintersect.cpp
|
|
--- a/src/selfintersect.cpp Thu Jan 12 15:49:04 2012 -0500
|
|
+++ b/src/selfintersect.cpp Fri Jan 13 03:13:32 2012 +0600
|
|
@@ -465,6 +465,7 @@
|
|
|
|
// returns true if no intersection, based upon edge^a_i and edge^b_j separating axis.
|
|
bool sat_edge(const vec3 tri_a[3], const vec3 tri_b[3], unsigned i, unsigned j) {
|
|
+ return false;
|
|
}
|
|
|
|
|