Merge branch 'master' into adjust-compiler-warnings

src/OpenVolumeMesh/Attribs/NormalAttribT_impl.hh

@@ -32,14 +32,6 @@
  *                                                                           *
 \*===========================================================================*/
 
-/*===========================================================================*\
- *                                                                           *
- *   $Revision$                                                         *
- *   $Date$                    *
- *   $LastChangedBy$                                                *
- *                                                                           *
-\*===========================================================================*/
-
 #define NORMALATTRIBT_CC
 
 #include <set>
@@ -53,8 +45,8 @@ namespace OpenVolumeMesh {
 template <class GeomKernelT>
 NormalAttrib<GeomKernelT>::NormalAttrib(GeomKernelT& _kernel) :
 kernel_(_kernel),
-v_normals_(_kernel.template request_vertex_property<typename GeomKernelT::PointT>("vertex_normals")),
-f_normals_(_kernel.template request_face_property<typename GeomKernelT::PointT>("face_normals"))
+v_normals_(_kernel.template request_vertex_property<typename GeomKernelT::PointT>("vertex_normals", typename GeomKernelT::PointT(0.0))),
+f_normals_(_kernel.template request_face_property<typename GeomKernelT::PointT>("face_normals", typename GeomKernelT::PointT(0.0)))
 {
 
 }

src/OpenVolumeMesh/Core/ResourceManager.cc

@@ -261,9 +261,9 @@ void ResourceManager::assignProperties(typename std::conditional<Move, Propertie
         bool found = false;
         for (auto it = dest.begin(); it != dest.end(); ++it) {
             auto dstprop = *it;
-            if (dstprop->name() == srcprop->name())
+            if (dstprop->name() == srcprop->name()
+                    && dstprop->internal_type_name() == srcprop->internal_type_name())
             {
-                // TODO: type check
                 out.push_back(dstprop);
                 dest.erase(it);
                 if (Move) {