diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-01 21:15:23 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-01 21:15:23 +0400 |
commit | 022a343223be895c4dfab63af28ed0a2b822df71 (patch) | |
tree | 9b09c9b8e8f7b718e0670f53e72936e31c05e1b1 /source/blender/makesdna | |
parent | 1525ed42c9b4d81deb686f3bdd5a5bdae70b5af2 (diff) |
Texture stack influences are now all separate values, and negative
mapped values now have their influence negated instead. Also a few
RNA changes for TextureSlot.
Bumped subversion for the version patch.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 24 |
2 files changed, 22 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index b3a7e74e91d..a925b60ac33 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -313,7 +313,7 @@ typedef struct Material { #define MAP_AMB 2048 #define MAP_DISPLACE 4096 #define MAP_WARP 8192 -#define MAP_LAYER 16384 +#define MAP_LAYER 16384 /* unused */ /* volume mapto - reuse definitions for now - a bit naughty! */ #define MAP_DENSITY 128 diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index c8f35b4306f..a43e5c7ae13 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -61,9 +61,27 @@ typedef struct MTex { float r, g, b, k; float def_var, rt; - float colfac, norfac, varfac; - float dispfac; - float warpfac; + /* common */ + float colfac, varfac; + + /* material */ + float norfac, dispfac, warpfac; + float colspecfac, mirrfac, alphafac; + float difffac, specfac, emitfac, hardfac; + float raymirrfac, translfac, ambfac; + float colemitfac, colreflfac, coltransfac; + float densfac, scatterfac, reflfac; + + /* particles */ + float timefac, lengthfac, clumpfac; + float kinkfac, roughfac, padensfac; + float lifefac, sizefac, ivelfac, pvelfac; + + /* lamp */ + float shadowfac; + + /* world */ + float zenupfac, zendownfac, blendfac; } MTex; #ifndef DNA_USHORT_FIX |