songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Weights-v2.0-GF' into Weights-v2.0-GF-5.5.x

This commit is contained in:
Mael Rouxel-Labbé 2022-11-22 18:35:06 +01:00
parent f6ac98882a 613ae0d564
commit e5cb2f8225
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BGL/include/CGAL/boost/graph/properties_OpenMesh.h
View File

@ -13,8 +13,6 @@
#include <CGAL/assertions.h>
#include <CGAL/boost/graph/properties.h>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Kernel_traits.h>
#include <boost/mpl/if.hpp>
#ifndef OPEN_MESH_CLASS
@ -233,8 +231,9 @@ public:
#if defined(CGAL_USE_OM_POINTS)
const_cast<OpenMesh&>(*pm.sm_).set_point(v,p);
#else
typedef typename CGAL::Kernel_traits<typename OpenMesh::Point>::type FT;
const_cast<OpenMesh&>(*pm.sm_).set_point(v, typename OpenMesh::Point(FT(p[0]), FT(p[1]), FT(p[2])));
typedef typename OpenMesh::vector_traits<typename OpenMesh::Point>::value_type Scalar;
const_cast<OpenMesh&>(*pm.sm_).set_point
(v, typename OpenMesh::Point(Scalar(p[0]), Scalar(p[1]), Scalar(p[2])));
#endif
}