diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-18 15:13:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-07-18 15:13:16 +0300 |
commit | 3d67819a1709e35b2fb42a9d554b30136a72eec9 (patch) | |
tree | da74b41c52fab9592ee12e3db0c046bf70d85d5a /source/blender/makesdna/DNA_node_types.h | |
parent | 257d072317f21861cdb7c168a60497bcb74d73d4 (diff) | |
parent | 5078b9d2d08a34ae3786100c2301ea960165e7f2 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_node_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index ca01ffc2b29..31a5931dde4 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -905,6 +905,14 @@ typedef struct NodeSunBeams { float ray_length; } NodeSunBeams; +typedef struct NodeCryptomatte { + float add[3]; + float remove[3]; + char *matte_id; + int num_inputs; + int pad; +} NodeCryptomatte; + /* script node mode */ #define NODE_SCRIPT_INTERNAL 0 #define NODE_SCRIPT_EXTERNAL 1 @@ -953,6 +961,11 @@ typedef struct NodeSunBeams { #define SHD_HAIR_REFLECTION 0 #define SHD_HAIR_TRANSMISSION 1 +/* principled hair parametrization */ +#define SHD_PRINCIPLED_HAIR_REFLECTANCE 0 +#define SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION 1 +#define SHD_PRINCIPLED_HAIR_DIRECT_ABSORPTION 2 + /* blend texture */ #define SHD_BLEND_LINEAR 0 #define SHD_BLEND_QUADRATIC 1 |