diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-13 05:10:39 +0300 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-13 05:10:39 +0300 |
| commit | c8deda32763d68b59d28f00734785dc0c7a91571 (patch) | |
| tree | d5b7320d79136c7c2d0282fe45ec3be619ec6806 /source/blender/makesdna/DNA_material_types.h | |
| parent | 33efa9eeb63db672d9da97b68718aefb14b98f64 (diff) | |
| parent | 25a2eb4675f8e1fcf8b990bc345aac694dba8228 (diff) | |
Merged changes in the trunk up to revision 35505.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 9d97b6af8f3..b8540fabd5b 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -160,7 +160,9 @@ typedef struct Material { short sss_flag, sss_preset; int mapto_textured; /* render-time cache to optimise texture lookups */ - short vcol_alpha, pad4; + short shadowonly_flag; /* "shadowsonly" type */ + + short vcol_alpha; ListBase gpumaterial; /* runtime */ } Material; @@ -238,6 +240,11 @@ typedef struct Material { #define MA_RAYMIR_FADETOSKY 0 #define MA_RAYMIR_FADETOMAT 1 +/* shadowonly_flag */ +#define MA_SO_OLD 0 +#define MA_SO_SHADOW 1 +#define MA_SO_SHADED 2 + /* shade_flag */ #define MA_CUBIC 1 #define MA_OBCOLOR 2 |