diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-11-16 23:55:13 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-11-16 23:55:13 +0300 |
| commit | c9fb08e075733fbba11be3dd1881fb3422fc6b94 (patch) | |
| tree | c8bfd87b1a6ef7728ea3dbc10d578cc007bfe0c5 /intern/cycles/kernel/types.h | |
| parent | 9d7422b817d143b4c50c00c7d5b860a9e414c517 (diff) | |
| parent | f30e1fd2f0648d6c88bc61142ecc003ffa33ce11 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/kernel/types.h')
| -rw-r--r-- | intern/cycles/kernel/types.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index 196c7c92a80..74b34524786 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -272,33 +272,34 @@ enum PathRayFlag { PATH_RAY_SUBSURFACE_RANDOM_WALK = (1U << 20U), PATH_RAY_SUBSURFACE_DISK = (1U << 21U), PATH_RAY_SUBSURFACE_USE_FRESNEL = (1U << 22U), + PATH_RAY_SUBSURFACE_BACKFACING = (1U << 23U), PATH_RAY_SUBSURFACE = (PATH_RAY_SUBSURFACE_RANDOM_WALK | PATH_RAY_SUBSURFACE_DISK | - PATH_RAY_SUBSURFACE_USE_FRESNEL), + PATH_RAY_SUBSURFACE_USE_FRESNEL | PATH_RAY_SUBSURFACE_BACKFACING), /* Contribute to denoising features. */ - PATH_RAY_DENOISING_FEATURES = (1U << 23U), + PATH_RAY_DENOISING_FEATURES = (1U << 24U), /* Render pass categories. */ - PATH_RAY_SURFACE_PASS = (1U << 24U), - PATH_RAY_VOLUME_PASS = (1U << 25U), + PATH_RAY_SURFACE_PASS = (1U << 25U), + PATH_RAY_VOLUME_PASS = (1U << 26U), PATH_RAY_ANY_PASS = (PATH_RAY_SURFACE_PASS | PATH_RAY_VOLUME_PASS), /* Shadow ray is for a light or surface, or AO. */ - PATH_RAY_SHADOW_FOR_LIGHT = (1U << 26U), - PATH_RAY_SHADOW_FOR_AO = (1U << 27U), + PATH_RAY_SHADOW_FOR_LIGHT = (1U << 27U), + PATH_RAY_SHADOW_FOR_AO = (1U << 28U), /* A shadow catcher object was hit and the path was split into two. */ - PATH_RAY_SHADOW_CATCHER_HIT = (1U << 28U), + PATH_RAY_SHADOW_CATCHER_HIT = (1U << 29U), /* A shadow catcher object was hit and this path traces only shadow catchers, writing them into * their dedicated pass for later division. * * NOTE: Is not covered with `PATH_RAY_ANY_PASS` because shadow catcher does special handling * which is separate from the light passes. */ - PATH_RAY_SHADOW_CATCHER_PASS = (1U << 29U), + PATH_RAY_SHADOW_CATCHER_PASS = (1U << 30U), /* Path is evaluating background for an approximate shadow catcher with non-transparent film. */ - PATH_RAY_SHADOW_CATCHER_BACKGROUND = (1U << 30U), + PATH_RAY_SHADOW_CATCHER_BACKGROUND = (1U << 31U), }; /* Configure ray visibility bits for rays and objects respectively, |