Merge

Former-commit-id: 3c4007521341c2ff912cebe3786f215b2ea37cb0

include/igl/ReAntTweakBar.cpp

@@ -35,7 +35,7 @@ IGL_INLINE TwType igl::ReTwDefineEnum(
   return type;
 }
 
-IGL_INLINE TwType igl::ReTwDefineEnum(
+IGL_INLINE TwType igl::ReTwDefineEnumFromString(
   const char * _Name,
   const char * _EnumString)
 {

include/igl/ReAntTweakBar.h

@@ -31,10 +31,6 @@
 // Copyright Alec Jacobson, 2011
 //
 
-// Known bugs:
-//  TwDefineEnumFromString is not supported (use ReTwDefineEnum instead)
-//  Custom enums should not have spaces in their names
-
 // This allows the user to have a non-global, static installation of
 // AntTweakBar
 #ifdef STATIC_ANTTWEAKBAR
@@ -57,7 +53,7 @@ namespace igl
     const char *name, 
     const TwEnumVal *enumValues, 
     unsigned int nbValues);
-  TwType ReTwDefineEnum(const char * name,const char * enumString);
+  TwType ReTwDefineEnumFromString(const char * name,const char * enumString);
   
   struct ReTwRWItem
   {

include/igl/draw_mesh.cpp

@@ -132,6 +132,9 @@ IGL_INLINE void igl::draw_mesh(
       }else if(N.rows() == F.rows())
       {
         glNormal3d(N(i,0),N(i,1),N(i,2));
+      }else
+      {
+        assert(N.size() == 0);
       }
       glVertex3d(V(F(i,j),0),V(F(i,j),1),V(F(i,j),2));
     }

include/igl/readDMAT.cpp

@@ -195,4 +195,5 @@ IGL_INLINE bool igl::readDMAT(
 template bool igl::readDMAT<Eigen::Matrix<double, -1, -1, 0, -1, -1> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Eigen::PlainObjectBase<Eigen::Matrix<double, -1, -1, 0, -1, -1> >&);
 template bool igl::readDMAT<double>(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::vector<std::vector<double, std::allocator<double> >, std::allocator<std::vector<double, std::allocator<double> > > >&);
 template bool igl::readDMAT<Eigen::Matrix<int, -1, -1, 0, -1, -1> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Eigen::PlainObjectBase<Eigen::Matrix<int, -1, -1, 0, -1, -1> >&);
+template bool igl::readDMAT<Eigen::Matrix<double, 4, 1, 0, 4, 1> >(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, Eigen::PlainObjectBase<Eigen::Matrix<double, 4, 1, 0, 4, 1> >&);
 #endif