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/render-opencsg.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/render-opencsg.h')
| -rw-r--r-- | src/render-opencsg.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/render-opencsg.h b/src/render-opencsg.h deleted file mode 100644 index 9433cbe..0000000 --- a/src/render-opencsg.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef RENDER_OPENCSG_H_ -#define RENDER_OPENCSG_H_ - -#include <GL/glew.h> - -void renderCSGChainviaOpenCSG(class CSGChain *chain, GLint *shaderinfo, bool highlight, bool background); - -#endif |