Special bf-committers request; Lamp/World/Material now each have 10

channels to link texture to.

The amount of code changes seems large, but is mostly getting rind of
hardcoded values (6 and 8) for channels, replacing it with MAX_MTEX.

Further did some fixes;
- Ipo for Lamp showed too many mapping channels
- Texture MapTo buttons for lamp missed the slider to blend texture color
- Lamp texture mapping "View" only worked for Spot, now it uses lamp-
  view vector for all types. (Nice for projections!)

4 files changed, 18 insertions, 4 deletions

diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 8363fa0481a..206c531d77f 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -153,6 +153,8 @@ typedef short IPO_Channel;
 #define MA_MAP6		0x400
 #define MA_MAP7		0x800
 #define MA_MAP8		0x1000
+#define MA_MAP9		0x2000
+#define MA_MAP10	0x4000
 
 #define TEX_TOTNAM	14
 
@@ -252,7 +254,7 @@ typedef short IPO_Channel;
 
 /* ******************** */
 
-#define LA_TOTIPO	23
+#define LA_TOTIPO	21
 #define LA_TOTNAM	10
 
 #define LA_ENERGY	1
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 4c8811e1d52..96aaf66f2eb 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -37,6 +37,10 @@
 #include "DNA_ID.h"
 #include "DNA_scriptlink_types.h"
 
+#ifndef MAX_MTEX
+#define MAX_MTEX	10
+#endif
+
 struct MTex;
 struct Ipo;
 
@@ -68,7 +72,7 @@ typedef struct Lamp {
 	short YF_phdepth, YF_useqmc, YF_bufsize, YF_pad;
 	float YF_causticblur, YF_ltradius;
 	
-	struct MTex *mtex[8];
+	struct MTex *mtex[10];
 	struct Ipo *ipo;
 	
 	ScriptLink scriptlink;
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index f2c41845320..28f3a7551c7 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -39,6 +39,10 @@
 #include "DNA_ID.h"
 #include "DNA_scriptlink_types.h"
 
+#ifndef MAX_MTEX
+#define MAX_MTEX	10
+#endif
+
 struct MTex;
 struct Ipo;
 struct Material;
@@ -87,7 +91,7 @@ typedef struct Material {
 	short ramp_show, pad3;
 	float rampfac_col, rampfac_spec;
 	
-	struct MTex *mtex[8];
+	struct MTex *mtex[10];
 	struct Ipo *ipo;
 	struct Material *ren;
 	
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 30cb6071d78..8404beaf733 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -40,6 +40,10 @@
 struct Ipo;
 struct MTex;
 
+#ifndef MAX_MTEX
+#define MAX_MTEX	10
+#endif
+
 
 /**
  * World defines general modelling data such as a background fill,
@@ -101,7 +105,7 @@ typedef struct World {
 	int physicsEngine;
 
 	struct Ipo *ipo;
-	struct MTex *mtex[8];
+	struct MTex *mtex[10];
 
 	ScriptLink scriptlink;