Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2008-04-02 19:03:03 +0400
committerKent Mein <mein@cs.umn.edu>2008-04-02 19:03:03 +0400
commitb73ba9c1812d90ecdd9d76d3347843cbd26327bb (patch)
treec72c5ad2da08c544fca7a8483ca361edce6d28a4 /source/blender/include
parent04be9955d09b746ce0ebf1f4295f3cb226674d00 (diff)
This commit reverts the #include <mesa/glu.h>
stuff used for peach to the standard <GL/glu.h> the mesa stuff was needed for the machines for peach but its not the stanard location of the headers, now that its not needed were switching it back. Kent
Diffstat (limited to 'source/blender/include')
-rw-r--r--source/blender/include/BIF_gl.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h
index 8fa305362af..558e954c1eb 100644
--- a/source/blender/include/BIF_gl.h
+++ b/source/blender/include/BIF_gl.h
@@ -56,20 +56,22 @@
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#else
- #if defined (__sun) || defined (__sun__)
+/* #if defined (__sun) || defined (__sun__)
#include <GL/gl.h>
#include <mesa/glu.h>
#else
+*/
#include <GL/gl.h>
#include <GL/glu.h>
- #endif
+/* #endif */
#endif
+
+
/*
* these should be phased out. cpack should be replaced in
* code with calls to glColor3ub, lrectwrite probably should
* change to a function. - zr
*/
-
/*
*
* This define converts a numerical value to the equivalent 24-bit