diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 17:34:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 17:34:04 +0400 |
| commit | a47c673b5525fde6484d4392160fbb5101f2c108 (patch) | |
| tree | cb05981d656de969d91e12d8f74a34bfaf2ed810 /source/blender/makesdna/DNA_material_types.h | |
| parent | 56b726917d35ac51c86c3fd10580ac740124494d (diff) | |
2.5 Material:
* Added material "type" property, with Surface/Volume/Halo
options, compatible with sim_physics, as requested for
material buttons layout. Obviously the Volume setting
does nothing currently.
* Deprecated MA_HALO flag in favor of this.
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 4ffd2060568..cd0b73c8f70 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -52,7 +52,7 @@ typedef struct Material { ID id; struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ - short colormodel, flag; + short material_type, flag; /* note, keep this below synced with render_types.h */ float r, g, b; float specr, specg, specb; @@ -147,11 +147,10 @@ typedef struct Material { */ #define MAXMAT 16 -/* colormodel */ -#define MA_RGB 0 -#define MA_CMYK 1 -#define MA_YUV 2 -#define MA_HSV 3 +/* material_type */ +#define MA_TYPE_SURFACE 0 +#define MA_TYPE_HALO 1 +#define MA_TYPE_VOLUME 2 /* flag */ /* for render */ @@ -166,7 +165,7 @@ typedef struct Material { #define MA_WIRE 8 #define MA_VERTEXCOL 16 #define MA_HALO_SOFT 16 -#define MA_HALO 32 +#define MA_HALO 32 /* deprecated */ #define MA_ZTRA 64 #define MA_VERTEXCOLP 128 #define MA_ZINV 256 |