diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-18 14:49:12 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-12-18 14:49:12 +0300 |
commit | 3368a595dae178dcdf025523232e0961b4ced61e (patch) | |
tree | b970e27e9da9da4c00812d3c8bff27271ee275ca /source/blender/makesdna/DNA_material_types.h | |
parent | c4e41d7371522b46fb14cf8d809d5e3d470a1457 (diff) | |
parent | a93411629811ec20f576895c0cb515b9abd7ec19 (diff) |
Merged changes in the trunk up to revision 33765.
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 9d87f618ec4..0a49aed505e 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -300,6 +300,7 @@ typedef struct Material { #define TEXCO_TANGENT 4096 /* still stored in vertex->accum, 1 D */ #define TEXCO_STRAND 8192 +#define TEXCO_PARTICLE 8192 /* strand is used for normal materials, particle for halo materials */ #define TEXCO_STRESS 16384 #define TEXCO_SPEED 32768 |