Commit 9d6fd632 authored by CGoGN GIT Supervisor's avatar CGoGN GIT Supervisor

Merge branch 'master' of /home/sauvage/CGoGN

* 'master' of /home/sauvage/CGoGN:
  correction d'include dans colorMaps.h
  bug template dans GL1

Conflicts:
	include/Utils/colorMaps.h
parents e1e6105c b171bc80
......@@ -118,7 +118,7 @@ void renderTriQuadPoly(typename PFP::MAP& the_map, RenderType rt, float explode,
glBegin(GL_TRIANGLES);
the_map.foreach_orbit(FACE, fgl_tri, good);
the_map.template foreach_orbit<FACE>(fgl_tri, good);
glEnd();
// get untreated quads & polygons
......@@ -177,7 +177,7 @@ void renderNormalVertices(typename PFP::MAP& the_map, const VertexAttribute<type
FunctorGLNormal<PFP> fgl_norm(the_map, good, position, normal, scale);
glBegin(GL_LINES);
the_map.foreach_orbit(VERTEX, fgl_norm, good);
the_map.template foreach_orbit<VERTEX>(fgl_norm, good);
glEnd();
}
......@@ -187,7 +187,7 @@ void renderFrameVertices(typename PFP::MAP& the_map, const VertexAttribute<typen
FunctorGLFrame<PFP> fgl_frame(the_map, good, position, frame, scale) ;
glBegin(GL_LINES) ;
the_map.foreach_orbit(VERTEX, fgl_frame, good) ;
the_map.template foreach_orbit<VERTEX>(fgl_frame, good) ;
glEnd();
}
......
......@@ -117,5 +117,3 @@ float scale_to_0_1_around_one_half(float x, float min, float max);
#endif
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