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/makesdna/DNA_world_types.h
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/makesdna/DNA_world_types.h')
-rw-r--r--source/blender/makesdna/DNA_world_types.h6
1 files changed, 5 insertions, 1 deletions
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;