Commit d37341fb authored by Jan Möbius's avatar Jan Möbius

Merge branch 'master' into adjust-compiler-warnings

parents 84d654a3 bdd674be
Pipeline #10597 passed with stage
in 4 minutes and 25 seconds
...@@ -32,14 +32,6 @@ ...@@ -32,14 +32,6 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* $LastChangedBy$ *
* *
\*===========================================================================*/
#define NORMALATTRIBT_CC #define NORMALATTRIBT_CC
#include <set> #include <set>
...@@ -53,8 +45,8 @@ namespace OpenVolumeMesh { ...@@ -53,8 +45,8 @@ namespace OpenVolumeMesh {
template <class GeomKernelT> template <class GeomKernelT>
NormalAttrib<GeomKernelT>::NormalAttrib(GeomKernelT& _kernel) : NormalAttrib<GeomKernelT>::NormalAttrib(GeomKernelT& _kernel) :
kernel_(_kernel), kernel_(_kernel),
v_normals_(_kernel.template request_vertex_property<typename GeomKernelT::PointT>("vertex_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")) f_normals_(_kernel.template request_face_property<typename GeomKernelT::PointT>("face_normals", typename GeomKernelT::PointT(0.0)))
{ {
} }
......
...@@ -261,9 +261,9 @@ void ResourceManager::assignProperties(typename std::conditional<Move, Propertie ...@@ -261,9 +261,9 @@ void ResourceManager::assignProperties(typename std::conditional<Move, Propertie
bool found = false; bool found = false;
for (auto it = dest.begin(); it != dest.end(); ++it) { for (auto it = dest.begin(); it != dest.end(); ++it) {
auto dstprop = *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); out.push_back(dstprop);
dest.erase(it); dest.erase(it);
if (Move) { if (Move) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment