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.

10 files changed, 48 insertions, 26 deletions

diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 1c272105067..c7196763358 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -33,7 +33,7 @@
 #include "DNA_ID.h"
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 struct MTex;
@@ -58,7 +58,7 @@ typedef struct Brush {
 	float alpha;				/* opacity */
 
 	short texact, pad;
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];		/* MAX_MTEX */
 
 	struct BrushClone clone;
 } Brush;
diff --git a/source/blender/makesdna/DNA_group_types.h b/source/blender/makesdna/DNA_group_types.h
index 1bb18ca2ca2..0987050261d 100644
--- a/source/blender/makesdna/DNA_group_types.h
+++ b/source/blender/makesdna/DNA_group_types.h
@@ -54,7 +54,7 @@ typedef struct Group {
 	 * the objects that show in the group can change depending
 	 * on the last used scene */
 	unsigned int layer;
-	int pad;
+	float dupli_ofs[3];
 } Group;
 
 
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 42b651a7555..e1d79f0f875 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -37,6 +37,7 @@ struct PackedFile;
 struct anim;
 struct ImBuf;
 struct RenderResult;
+struct GPUTexture;
 
 
 /* ImageUser is in Texture, in Nodes, Background Image, Image Window, .... */
@@ -62,7 +63,8 @@ typedef struct Image {
 	
 	char name[240];			/* file path */
 	
-	ListBase ibufs;			/* not written in file */
+	ListBase ibufs;					/* not written in file */
+	struct GPUTexture *gputexture;	/* not written in file */
 	
 	/* sources from: */
 	struct anim *anim;
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
 
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index c00dae08eb4..2a39580bb5c 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -35,7 +35,7 @@
 #include "DNA_scriptlink_types.h"
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 struct MTex;
@@ -45,7 +45,8 @@ struct CurveMapping;
 typedef struct Lamp {
 	ID id;
 	
-	short type, mode;
+	short type, pad3;
+	int mode;
 	
 	short colormodel, totex;
 	float r, g, b, k;
@@ -55,10 +56,9 @@ typedef struct Lamp {
 	
 	
 	float att1, att2;	/* Quad1 and Quad2 attenuation */
-	int pad2;
 	struct CurveMapping *curfalloff;
 	short falloff_type;
-	short pad3;
+	short pad2;
 	
 	float clipsta, clipend, shadspotsize;
 	float bias, soft;
@@ -99,7 +99,7 @@ typedef struct Lamp {
 	float YF_glowint, YF_glowofs;
 	short YF_glowtype, YF_pad2;
 	
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];			/* MAX_MTEX */
 	struct Ipo *ipo;
 	
 	/* preview */
@@ -137,6 +137,12 @@ typedef struct Lamp {
 /* yafray: lamp shadowbuffer flag, softlight */
 /* Since it is used with LOCAL lamp, can't use LA_SHAD */
 #define LA_YF_SOFT		16384
+#define LA_LAYER_SHADOW	32768
+
+/* layer_shadow */
+#define LA_LAYER_SHADOW_BOTH	0
+#define LA_LAYER_SHADOW_CAST	1
+#define LA_LAYER_SHADOW_RECEIVE	2
 
 /* sun effect type*/
 #define LA_SUN_EFFECT_SKY			1
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 9412a09d0f4..c92a33bbcbb 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -36,7 +36,7 @@
 #include "DNA_listBase.h"
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 struct MTex;
@@ -88,11 +88,11 @@ typedef struct Material {
 	float sbias;			/* shadow bias to prevent terminator prob */
 	float lbias;			/* factor to multiply lampbias with (0.0 = no mult) */
 	float shad_alpha;		/* in use for irregular shadowbuffer */
-	float padf;				/* free padding, take me! */
+	int	septex;
 	
 	/* for buttons and render*/
 	char rgbsel, texact, pr_type, use_nodes;
-	short pr_back, pr_lamp, septex, ml_flag;	/* ml_flag is for disable base material */
+	short pr_back, pr_lamp, pad4, ml_flag;	/* ml_flag is for disable base material */
 	
 	/* shaders */
 	short diff_shader, spec_shader;
@@ -110,7 +110,7 @@ typedef struct Material {
 	short ramp_show, pad3;
 	float rampfac_col, rampfac_spec;
 
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];		/* MAX_MTEX */
 	struct bNodeTree *nodetree;	
 	struct Ipo *ipo;
 	struct Group *group;	/* light group */
@@ -133,6 +133,8 @@ typedef struct Material {
 	int YF_dsmp, YF_preset, YF_djit;
 	
 	ScriptLink scriptlink;
+
+	ListBase gpumaterial;		/* runtime */
 } Material;
 
 /* **************** MATERIAL ********************* */
@@ -203,6 +205,7 @@ typedef struct Material {
 
 /* shade_flag */
 #define MA_CUBIC			1
+#define MA_OBCOLOR			2
 
 /* diff_shader */
 #define MA_DIFF_LAMBERT		0
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 85c49a03569..d258cf77ef5 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -223,6 +223,8 @@ typedef struct Object {
 /*#ifdef WITH_VERSE*/
 	void *vnode;			/* pointer at object VerseNode */
 /*#endif*/
+
+	ListBase gpulamp;		/* runtime, for lamps only */
 } Object;
 
 /* Warning, this is not used anymore because hooks are now modifiers */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 75affbfa7f5..72050b0809e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -464,7 +464,7 @@ typedef struct SculptData
 	struct SculptSession *session;
 
 	/* Pointers to all of sculptmodes's textures */
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];
 
 	/* Editable brush shape */
 	struct CurveMapping *cumap;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 856324695a9..11b35b4d6d4 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -188,6 +188,7 @@ typedef struct UserDef {
 	char fontname[256];		// FILE_MAXDIR+FILE length
 	struct ListBase themes;
 	short undosteps;
+	short undomemory, pad[3];
 	short curssize;
 	short tb_leftmouse, tb_rightmouse;
 	struct SolidLight light[3];
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 26b3f051944..ab7e25190ad 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -38,7 +38,7 @@ struct Ipo;
 struct MTex;
 
 #ifndef MAX_MTEX
-#define MAX_MTEX	10
+#define MAX_MTEX	18
 #endif
 
 
@@ -108,7 +108,7 @@ typedef struct World {
 	
 	
 	struct Ipo *ipo;
-	struct MTex *mtex[10];
+	struct MTex *mtex[18];		/* MAX_MTEX */
 
 	/* previews */
 	struct PreviewImage *preview;