Merge branch 'master' of github.com:libigl/libigl into alecjacobson

libigl · Oct 27, 2016 · a834eee · a834eee
2 parents 852961c + 4e7ec01
commit a834eee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/include/igl/boundary_loop.cpp b/include/igl/boundary_loop.cpp
@@ -114,6 +114,13 @@ IGL_INLINE void igl::boundary_loop(
     }
   }
 
+  //Check for meshes without boundary
+  if (idxMax == -1)
+  {
+      L.clear();
+      return;
+  }
+
   L.resize(Lall[idxMax].size());
   for (size_t i = 0; i < Lall[idxMax].size(); ++i)
   {

diff --git a/include/igl/slim.cpp b/include/igl/slim.cpp
@@ -361,7 +361,7 @@ void WeightedGlobalLocal::solve_weighted_arap(const Eigen::MatrixXd& V, const Ei
   } else { // seems like CG performs much worse for 2D and way better for 3D
     Eigen::VectorXd guess(uv.rows()*dim);
     for (int i = 0; i < dim; i++) for (int j = 0; j < dim; j++) guess(uv.rows()*i + j) = uv(i,j); // flatten vector
-    ConjugateGradient<SparseMatrix<double>, Eigen::Upper> solver;
+    ConjugateGradient<SparseMatrix<double>, Eigen::Lower|Upper> solver;
     solver.setTolerance(1e-8);
     Uc = solver.compute(L).solveWithGuess(rhs,guess);
   }