Merge branch 'master' into remove_compile_order_check

src/Unittests/unittests_common.hh

@@ -8,8 +8,16 @@
 
 #include <OpenMesh/Core/IO/MeshIO.hh>
 
+#ifdef TEST_CUSTOM_TRAITS
+#include <Unittests/unittests_common_customtraits.hh>
+#elif defined(TEST_DOUBLE_TRAITS)
+struct CustomTraits : public OpenMesh::DefaultTraitsDouble {
+};
+#else
 struct CustomTraits : public OpenMesh::DefaultTraits {
 };
+#endif
+
 
 typedef OpenMesh::TriMesh_ArrayKernelT<CustomTraits> Mesh;