diff options
| author | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
| commit | 6882228058d313bb7b98fddd90239bdb1a3e25ef (patch) | |
| tree | 9e3f0077a319939df7496fc6b18350c44cc4b0ec /src/polyset.h | |
| parent | dd9dfcb4ece4dcd1ae7f3374ef03a4babdb91dd8 (diff) | |
| parent | c79ad5010e4ae8a612de5423cd52a518ed6b4d65 (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.cc
Diffstat (limited to 'src/polyset.h')
| -rw-r--r-- | src/polyset.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/polyset.h b/src/polyset.h index 0183fd8..aae32f6 100644 --- a/src/polyset.h +++ b/src/polyset.h @@ -1,10 +1,7 @@ #ifndef POLYSET_H_ #define POLYSET_H_ -#ifdef ENABLE_OPENCSG -// this must be included before the GL headers -# include <GL/glew.h> -#endif +#include <GL/glew.h> // this must be included before the GL headers #include <qgl.h> #include "grid.h" |