Commit 5bcd6811 authored by Sylvain Thery's avatar Sylvain Thery

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

parents 412ca15a 51a9d2d8
......@@ -33,8 +33,6 @@
#include "Topology/generic/traversorCell.h"
#include "Algo/Geometry/centroid.h"
#include <sys/time.h>
namespace CGoGN
{
......
......@@ -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;
......
......@@ -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;
......
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