diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-21 08:41:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-21 08:41:03 +0300 |
| commit | 3e555d3d785b17bf9398d7666d5131c994da8c6b (patch) | |
| tree | d15aaa353e31ed2acbd105d2b48ac4b1c99ea1e5 /intern/cycles/kernel/kernel_types.h | |
| parent | d007828ae78d66cdcc005d9ba3ad57e987f0190a (diff) | |
| parent | 0033f0e161d984b38d3a36d18448f16baef121aa (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 58371c56267..ce52ed4191c 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -878,7 +878,7 @@ enum ShaderDataFlag { SD_VOLUME_MIS = (1 << 23), /* Use cubic interpolation for voxels. */ SD_VOLUME_CUBIC = (1 << 24), - /* Has data connected to the displacement input. */ + /* Has data connected to the displacement input or uses bump map. */ SD_HAS_BUMP = (1 << 25), /* Has true displacement. */ SD_HAS_DISPLACEMENT = (1 << 26), |