diff options
| author | William Reynish <billrey@me.com> | 2019-04-14 19:41:10 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-14 21:09:02 +0300 |
| commit | f5ea1fc4fbafbac6f648ba0d9d9ef16ca8323041 (patch) | |
| tree | 26db8316aa052ad327b44ef15746ac6e09896143 /source/blender/makesdna/DNA_material_types.h | |
| parent | 8b0102b443571a19ab17e141623cfc029320813c (diff) | |
Render: new material preview
* EEVEE support through irradiance volume and light probe.
* New shader ball shape (designed by Robin Marin).
* New cloth and liquid shapes, removed monkey.
* Replace world sphere by toggle to use world for any shape.
* Slight bevel on cube.
* More subdivision for displacement preview.
* Fixed and improved UV mapping for all shapes.
* Material icon / asset preview now uses specified shape instead of always
a sphere. So for example hair material can be displayed as hair.
Ref T57683
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 { |