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, 9 insertions, 1 deletions

diff --git a/source/blender/src/editipo_lib.c b/source/blender/src/editipo_lib.c
index e1e286e10cf..7bfd097b87f 100644
--- a/source/blender/src/editipo_lib.c
+++ b/source/blender/src/editipo_lib.c
@@ -392,7 +392,15 @@ int texchannel_to_adrcode(int channel)
 		case 6: return MA_MAP7; 
 		case 7: return MA_MAP8; 
 		case 8: return MA_MAP9; 
-		case 9: return MA_MAP10; 
+		case 9: return MA_MAP10;
+		case 10: return MA_MAP11;
+		case 11: return MA_MAP12;
+		case 12: return MA_MAP13;
+		case 13: return MA_MAP14;
+		case 14: return MA_MAP15;
+		case 15: return MA_MAP16;
+		case 16: return MA_MAP17;
+		case 17: return MA_MAP18;
 		default: return 0;
 	}
 }