Merge branch 'master' of cgogn:~thery/CGoGN

include/Algo/Render/GL2/topo3Render.hpp

@@ -33,8 +33,6 @@
 #include "Topology/generic/traversorCell.h"
 #include "Algo/Geometry/centroid.h"
 
-#include <sys/time.h>
-
 namespace CGoGN
 {
 

include/Utils/Shaders/shaderExplodeVolumes.geom

@@ -10,7 +10,7 @@ uniform vec4 ambient;
 uniform vec4 backColor;
 uniform vec4 plane;
 
-VARYING_IN vec3 colorVertex[];
+VARYING_IN vec3 colorVertex[3];
 VARYING_OUT vec4 ColorFS;
 
 

src/Utils/frameManipulator.cpp

@@ -865,7 +865,7 @@ float FrameManipulator::distanceFromMouse(int dx, int dy)
 float FrameManipulator::scaleFromMouse(int dx, int dy)
 {
 
-	if (fabs(dx) > fabs(dy))
+	if (abs(dx) > abs(dy))
 	{
 		if (dx>0)
 			return 1.01;