Merge of first part of changes from the apricot branch, especially

the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:

* GLSL support in the viewport and game engine, enable in the game
  menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
  gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
  storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.

* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
  An extra texture slot shows up once the last slot is used.

* Memory limit for undo, not enabled by default yet because it
  needs the .B.blend to be changed.
* Multiple undo for image painting.

* An offset for dupligroups, so not all objects in a group have to
  be at the origin.

6 files changed, 9 insertions, 64 deletions

diff --git a/source/blender/include/BDR_drawmesh.h b/source/blender/include/BDR_drawmesh.h
index 93e08ab452d..34351549345 100644
--- a/source/blender/include/BDR_drawmesh.h
+++ b/source/blender/include/BDR_drawmesh.h
@@ -30,52 +30,11 @@
 #ifndef BDR_DRAWMESH_H
 #define BDR_DRAWMESH_H
 
-struct Image;
-struct MTFace;
 struct Object;
 struct DerivedMesh;
-struct Mesh;
-struct EdgeHash;
-
-/**
- * Enables or disable mipmapping for realtime images (textures).
- * Note that this will will destroy all texture bindings in OpenGL.
- * @see free_realtime_image()
- * @param mipmap Turn mipmapping on (mipmap!=0) or off (mipmap==0).
- */
-void set_mipmap(int mipmap);
-
-/**
- * Enables or disable linear mipmap setting for realtime images (textures).
- * Note that this will will destroy all texture bindings in OpenGL.
- * @see free_realtime_image()
- * @param mipmap Turn linear mipmapping on (linear!=0) or off (linear==0).
- */
-void set_linear_mipmap(int linear);
-
-/**
- * Returns the current setting for linear mipmapping.
- */
-int get_linear_mipmap(void);
-
-/**
- * Resets the realtime image cache variables.
- */
-void clear_realtime_image_cache(void);
-
-
-void update_realtime_image(struct Image *ima, int x, int y, int w, int h);
-void free_realtime_image(struct Image *ima);
-void free_all_realtime_images(void);
-void make_repbind(struct Image *ima);
-int set_tpage(struct MTFace *tface);
-
-void texpaint_enable_mipmap(void);
-void texpaint_disable_mipmap(void);
 
 void draw_mesh_textured(struct Object *ob, struct DerivedMesh *dm, int facesel);
-struct EdgeHash *get_tface_mesh_marked_edge_info(struct Mesh *me);
-void init_realtime_GL(void); 
+void draw_mesh_text(struct Object *ob, int glsl);
 
 #endif /* BDR_DRAWMESH_H */
 
diff --git a/source/blender/include/BDR_drawobject.h b/source/blender/include/BDR_drawobject.h
index de28db64c3b..635b73af80c 100644
--- a/source/blender/include/BDR_drawobject.h
+++ b/source/blender/include/BDR_drawobject.h
@@ -47,8 +47,7 @@ struct EditVert;
 struct EditFace;
 struct EditEdge;
 
-int set_gl_material(int nr);
-int init_gl_materials(struct Object *ob, int check_alpha);
+int draw_glsl_material(struct Object *ob, int dt);
 
 void mesh_foreachScreenVert(void (*func)(void *userData, struct EditVert *eve, int x, int y, int index), void *userData, int clipVerts);
 void mesh_foreachScreenEdge(void (*func)(void *userData, struct EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts);
diff --git a/source/blender/include/BDR_imagepaint.h b/source/blender/include/BDR_imagepaint.h
index 26f2375e60a..bd1ac301416 100644
--- a/source/blender/include/BDR_imagepaint.h
+++ b/source/blender/include/BDR_imagepaint.h
@@ -34,8 +34,8 @@ void imagepaint_redraw_tool(void);
 void imagepaint_pick(short mousebutton);
 void imagepaint_paint(short mousebutton, short texturepaint);
 
-void imagepaint_undo();
-void free_imagepaint();
+void undo_imagepaint_step(int step);
+void undo_imagepaint_clear(void);
 
 #endif /*  BDR_IMAGEPAINT_H */
 
diff --git a/source/blender/include/BIF_gl.h b/source/blender/include/BIF_gl.h
index 2468abdff60..c1b3b056d62 100644
--- a/source/blender/include/BIF_gl.h
+++ b/source/blender/include/BIF_gl.h
@@ -49,20 +49,7 @@
 #endif
 #endif
 
-#ifdef __APPLE__
- #include <OpenGL/gl.h>
- #include <OpenGL/glu.h>
-#else
-/*  #if defined (__sun) || defined (__sun__)
-  #include <GL/gl.h>
-  #include <mesa/glu.h>
- #else
-*/
-  #include <GL/gl.h>
-  #include <GL/glu.h>
-/* #endif */
-#endif
-
+#include "GL/glew.h"
 
 	/*
 	 * these should be phased out. cpack should be replaced in
diff --git a/source/blender/include/BIF_meshtools.h b/source/blender/include/BIF_meshtools.h
index d809d1f21f9..a894d66cb10 100644
--- a/source/blender/include/BIF_meshtools.h
+++ b/source/blender/include/BIF_meshtools.h
@@ -30,6 +30,8 @@
 #ifndef BIF_MESHTOOLS_H
 #define BIF_MESHTOOLS_H
 
+#include "BLO_sys_types.h"
+
 struct Object;
 struct EditVert;
 
diff --git a/source/blender/include/BSE_drawview.h b/source/blender/include/BSE_drawview.h
index e6f22a4fb67..1b2834b2e3b 100644
--- a/source/blender/include/BSE_drawview.h
+++ b/source/blender/include/BSE_drawview.h
@@ -36,8 +36,6 @@ struct rctf;
 struct ScrArea;
 struct ImBuf;
 
-void default_gl_light(void);
-void init_gl_stuff(void);
 void circf(float x, float y, float rad);
 void circ(float x, float y, float rad);
 
@@ -55,8 +53,8 @@ struct ImBuf *read_backbuf(short xmin, short ymin, short xmax, short ymax);
 unsigned int sample_backbuf_rect(short mval[2], int size, unsigned int min, unsigned int max, int *dist, short strict, unsigned int (*indextest)(unsigned int index));
 
 void drawview3dspace(struct ScrArea *sa, void *spacedata);
-void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]);
-void draw_depth(struct ScrArea *sa, void *spacedata);
+void drawview3d_render(struct View3D *v3d, float viewmat[][4], int winx, int winy, float winmat[][4], int shadow);
+void draw_depth(struct ScrArea *sa, void *spacedata, int (*func)(void *) );
 void view3d_update_depths(struct View3D *v3d);
 
 int update_time(int cfra);