Commit 59f6a4d5 authored by Jan Möbius's avatar Jan Möbius
Browse files

Use std except of qt max functions



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17516 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 6794217e
......@@ -64,6 +64,8 @@
#include <OpenMesh/Core/System/omstream.hh>
#include <OpenMesh/Core/Utils/Property.hh>
#include <algorithm>
//== NAMESPACES ==============================================================
......@@ -1848,8 +1850,8 @@ update_pick_buffers ()
}
}
pickVertexBuf_.resize (qMax (mesh_.n_vertices(), qMax (mesh_.n_edges() * 2, nfv)));
pickColorBuf_.resize (qMax (mesh_.n_vertices(), qMax (mesh_.n_edges() * 2, nfv)));
pickVertexBuf_.resize (std::max (mesh_.n_vertices(), std::max (mesh_.n_edges() * 2, size_t(nfv))));
pickColorBuf_.resize (std::max (mesh_.n_vertices(), std::max (mesh_.n_edges() * 2, size_t(nfv))));
}
//=============================================================================
......
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