Эх сурвалжийг харах

Merge remote-tracking branch 'origin/master' into viewer-refactor

Former-commit-id: e0aec8f30e4fa447c2cfdd2fe872cb10d21e123a
Jérémie Dumas 7 жил өмнө
parent
commit
ed4a92e825

+ 2 - 2
include/igl/mosek/mosek_linprog.cpp

@@ -79,9 +79,9 @@ IGL_INLINE bool igl::mosek::mosek_linprog(
     {
       if(lxj == uxj)
       {
-        k = MSK_BK_RA;
-      }else{
         k = MSK_BK_FX;
+      }else{
+        k = MSK_BK_RA;
       }
     }else if(isfinite(lxj))
     {

+ 1 - 1
include/igl/per_corner_normals.h

@@ -16,7 +16,7 @@ namespace igl
   // Compute vertex normals via vertex position list, face list
   // Inputs:
   //   V  #V by 3 eigen Matrix of mesh vertex 3D positions
-  //   F  #F by 3 eigne Matrix of face (triangle) indices
+  //   F  #F by 3 eigen Matrix of face (triangle) indices
   //   corner_threshold  threshold in degrees on sharp angles
   // Output:
   //   CN  #F*3 by 3 eigen Matrix of mesh vertex 3D normals, where the normal