diff --git a/Graphics/drawAxes.cpp b/Graphics/drawAxes.cpp index 21b5e6fa9286fe06b241530a8d3255e32b71ac60..db915e7c3828bc720d4302baf62e3e7227793f51 100644 --- a/Graphics/drawAxes.cpp +++ b/Graphics/drawAxes.cpp @@ -327,9 +327,6 @@ void drawContext::drawAxes() CTX::instance()->rotationCenter[1], CTX::instance()->rotationCenter[2], CTX::instance()->geom.light); } - - - } void drawContext::drawSmallAxes() diff --git a/contrib/DiscreteIntegration/DILevelset.h b/contrib/DiscreteIntegration/DILevelset.h index d4e25ad161b99fa88930a55dfe8a01fc5b8cd396..865507a267c15b8d57a8d088d7b01068b907de7f 100644 --- a/contrib/DiscreteIntegration/DILevelset.h +++ b/contrib/DiscreteIntegration/DILevelset.h @@ -20,7 +20,7 @@ #define CYLINDER 8 #define CONROD 9 #define LSMESH 10 -#define POINTS 11 +#define LSPOINTS 11 // don't define 'POINTS' as it's reserved by win32 // TOOLS #define CUT 11 #define UNION 12 @@ -166,7 +166,7 @@ public: // return negative value inward and positive value outward virtual double operator() (const double &x, const double &y, const double &z) const; void computeLS(std::vector<MVertex*> &vert); - int type() const {return POINTS;} + int type() const {return LSPOINTS;} }; class gLevelsetQuadric : public gLevelsetPrimitive