diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 21:01:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 21:06:28 +0300 |
| commit | 93e0e716f38175dca570a9d4b497e183650f03a4 (patch) | |
| tree | c2a6cb11e564f5f2834a08c41a69fb22b7d91eae /source/blender/makesdna | |
| parent | d27158aae9bc48b2a07760a2dbe8e642fcecbe57 (diff) | |
| parent | 23ccf5767fea1d7f1b50405334249b1a7a69d5c9 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 1642da25481..bc3fd46e1a9 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -243,6 +243,7 @@ typedef enum eScenePassType { SCE_PASS_SUBSURFACE_DIRECT = (1 << 28), SCE_PASS_SUBSURFACE_INDIRECT = (1 << 29), SCE_PASS_SUBSURFACE_COLOR = (1 << 30), + SCE_PASS_ROUGHNESS = (1 << 31), } eScenePassType; #define RE_PASSNAME_COMBINED "Combined" |