diff options
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 718ca4f3b7d..3db8bf92f56 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -147,11 +147,14 @@ typedef struct Material { float gloss_mir DNA_DEPRECATED; float roughness; float metallic; - char _pad0[2]; - /** For buttons and render. */ - char pr_type, use_nodes; + /** Nodes */ + char use_nodes; + + /** Preview render. */ + char pr_type; short pr_texture; + short pr_flag; /** Index for render passes. */ short index; @@ -279,13 +282,18 @@ typedef struct Material { #define MA_FLAT 0 #define MA_SPHERE 1 #define MA_CUBE 2 -#define MA_MONKEY 3 -#define MA_SPHERE_A 4 +#define MA_SHADERBALL 3 +#define MA_SPHERE_A 4 /* Used for icon renders only. */ #define MA_TEXTURE 5 #define MA_LAMP 6 #define MA_SKY 7 #define MA_HAIR 10 #define MA_ATMOS 11 +#define MA_CLOTH 12 +#define MA_FLUID 13 + +/* pr_flag */ +#define MA_PREVIEW_WORLD (1 << 0) /* blend_method */ enum { |