Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2004-12-05 00:49:02 +0300
committerTon Roosendaal <ton@blender.org>2004-12-05 00:49:02 +0300
commitaad31875d7224c58b1d94bd716bb5aab295fc8cb (patch)
tree8ef506c415f32ce8c5c5116c9f725f4369468852 /source/blender/src/editipo.c
parent8d4782f7297c4a703b23b6b5383c0d76e4907903 (diff)
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!)
Diffstat (limited to 'source/blender/src/editipo.c')
-rw-r--r--source/blender/src/editipo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c
index 9d7d02f80db..fa327316642 100644
--- a/source/blender/src/editipo.c
+++ b/source/blender/src/editipo.c
@@ -814,6 +814,8 @@ int texchannel_to_adrcode(int channel)
case 5: return MA_MAP6;
case 6: return MA_MAP7;
case 7: return MA_MAP8;
+ case 8: return MA_MAP9;
+ case 9: return MA_MAP10;
default: return 0;
}
}
@@ -2040,7 +2042,7 @@ void add_vert_ipo()
ei= get_editipo();
if(ei==0) {
- error("Too many EditIpos");
+ error("Too many (or no) EditIpos");
return;
}