Skip to content
Snippets Groups Projects
Commit 62b0c916 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix windows build (don't define 'POINTS' as it's reserved by win32)

parent 5c73cb63
No related branches found
No related tags found
No related merge requests found
...@@ -327,9 +327,6 @@ void drawContext::drawAxes() ...@@ -327,9 +327,6 @@ void drawContext::drawAxes()
CTX::instance()->rotationCenter[1], CTX::instance()->rotationCenter[2], CTX::instance()->rotationCenter[1], CTX::instance()->rotationCenter[2],
CTX::instance()->geom.light); CTX::instance()->geom.light);
} }
} }
void drawContext::drawSmallAxes() void drawContext::drawSmallAxes()
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define CYLINDER 8 #define CYLINDER 8
#define CONROD 9 #define CONROD 9
#define LSMESH 10 #define LSMESH 10
#define POINTS 11 #define LSPOINTS 11 // don't define 'POINTS' as it's reserved by win32
// TOOLS // TOOLS
#define CUT 11 #define CUT 11
#define UNION 12 #define UNION 12
...@@ -166,7 +166,7 @@ public: ...@@ -166,7 +166,7 @@ public:
// return negative value inward and positive value outward // return negative value inward and positive value outward
virtual double operator() (const double &x, const double &y, const double &z) const; virtual double operator() (const double &x, const double &y, const double &z) const;
void computeLS(std::vector<MVertex*> &vert); void computeLS(std::vector<MVertex*> &vert);
int type() const {return POINTS;} int type() const {return LSPOINTS;}
}; };
class gLevelsetQuadric : public gLevelsetPrimitive class gLevelsetQuadric : public gLevelsetPrimitive
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment