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

Merge branch 'Surface_modeling-new_package-GF' of ssh://scm.cgal.org/var/git/cgal into Surface_modeling-new_package-GF

This commit is contained in:
iyaz 2013-06-28 02:02:26 +03:00
parent 8b572b2baa 9ffa8ac7f8
commit 737a8dea33
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AABB_tree/include/CGAL/internal/AABB_tree/AABB_traversal_traits.h
View File

@ -138,7 +138,7 @@ public:
#else
boost::optional< typename AABBTraits::template Intersection_and_primitive_id<Query>::Type >
#endif
intersection = AABBTraits().intersection_object()(query, primitive);
intersection = m_traits.intersection_object()(query, primitive);
if(intersection)
{

10
Surface_modeling/doc/Surface_modeling/Doxyfile.in Normal file
View File

@ -0,0 +1,10 @@
@INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
PROJECT_NAME = "CGAL ${CGAL_CREATED_VERSION_NUM} - Triangulated Surface Mesh Deformation"
INPUT = ${CMAKE_SOURCE_DIR}/Surface_modeling/doc/Surface_modeling/ \
${CMAKE_SOURCE_DIR}/Surface_modeling/include
EXTRACT_ALL = false
HIDE_UNDOC_MEMBERS = true
HIDE_UNDOC_CLASSES = true

9
Surface_modeling/doc/Surface_modeling/dependencies Normal file
View File

@ -0,0 +1,9 @@
Manual
Kernel_23
STL_Extension
Algebraic_foundations
Circulator
Stream_support
Polyhedron
BGL
Surface_mesh_parameterization