diff options
| author | Matt Ebb <matt@mke3.net> | 2009-08-19 15:18:52 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2009-08-19 15:18:52 +0400 |
| commit | 132277f0989b0b7d99d883d22a2bade6534ae44c (patch) | |
| tree | 6d26c46f62749470130375061381353fd54c2364 /source/blender/makesdna/DNA_material_types.h | |
| parent | 8480ea2b0abacae00c90d37e7d99fa5e0c89eebe (diff) | |
| parent | e611c4756fa17c57855123dc2b5c2c2408b0d790 (diff) | |
svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 1729db37ad1..b4fdb07b520 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -194,7 +194,7 @@ typedef struct Material { #define MA_VERTEXCOL 16 #define MA_HALO_SOFT 16 #define MA_HALO 32 /* deprecated */ -#define MA_ZTRA 64 +#define MA_ZTRANSP 64 #define MA_VERTEXCOLP 128 #define MA_ZINV 256 #define MA_HALO_RINGS 256 @@ -210,7 +210,7 @@ typedef struct Material { #define MA_NOMIST 0x4000 #define MA_HALO_SHADE 0x4000 #define MA_HALO_FLARE 0x8000 -#define MA_RADIO 0x10000 +#define MA_TRANSP 0x10000 #define MA_RAYTRANSP 0x20000 #define MA_RAYMIRROR 0x40000 #define MA_SHADOW_TRA 0x80000 |