From aad31875d7224c58b1d94bd716bb5aab295fc8cb Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 4 Dec 2004 21:49:02 +0000 Subject: 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!) --- source/blender/makesdna/DNA_material_types.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/makesdna/DNA_material_types.h') 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; -- cgit v1.2.3