diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
| commit | ce03ec4b866a3e1a6f19a266bf2c38c2c4b4afd0 (patch) | |
| tree | c25f25286bde21fa170dc4a8582a12c19388f4e7 /source/blender/makesdna/DNA_material_types.h | |
| parent | 4c3140004aa61169061ddd2628a4f2c8d88f46a1 (diff) | |
| parent | 76e91d7a5f8c253543bd1c938c8e74872d7a6c81 (diff) | |
Merged changes in the trunk up to revision 38543.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index b8540fabd5b..e94e394d255 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -161,8 +161,10 @@ typedef struct Material { int mapto_textured; /* render-time cache to optimise texture lookups */ short shadowonly_flag; /* "shadowsonly" type */ + short index; /* custom index for render passes */ short vcol_alpha; + short pad[3]; ListBase gpumaterial; /* runtime */ } Material; |