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.

1 files changed, 18 insertions, 10 deletions

diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 1e30f3f7640..e7f46b81935 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -142,16 +142,24 @@ typedef short IPO_Channel;
 #define MA_FRESTRAI	25
 #define MA_ADD		26
 
-#define MA_MAP1		0x20
-#define MA_MAP2		0x40
-#define MA_MAP3		0x80
-#define MA_MAP4		0x100
-#define MA_MAP5		0x200
-#define MA_MAP6		0x400
-#define MA_MAP7		0x800
-#define MA_MAP8		0x1000
-#define MA_MAP9		0x2000
-#define MA_MAP10	0x4000
+#define MA_MAP1		1<<5
+#define MA_MAP2		1<<6
+#define MA_MAP3		1<<7
+#define MA_MAP4		1<<8
+#define MA_MAP5		1<<9
+#define MA_MAP6		1<<10
+#define MA_MAP7		1<<11
+#define MA_MAP8		1<<12
+#define MA_MAP9		1<<13
+#define MA_MAP10	1<<14
+#define MA_MAP11	1<<15
+#define MA_MAP12	1<<16
+#define MA_MAP13	1<<17
+#define MA_MAP14	1<<18
+#define MA_MAP15	1<<19
+#define MA_MAP16	1<<20
+#define MA_MAP17	1<<21
+#define MA_MAP18	1<<22
 
 #define TEX_TOTNAM	14