diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-26 16:07:57 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-26 16:07:57 +0300 |
| commit | 15edae617fa4e77095953932b0e3120e91d5beb5 (patch) | |
| tree | 264b3f3473151d7ab4c5700bd6eb04c5aecdf4ab /intern/cycles/device/device.cpp | |
| parent | f76c15efb70207cf4e92708e0565110bbae854ab (diff) | |
| parent | dabe5cd31add8aa55b9ad4bce1b591ed4e98f1a1 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/device/device.cpp')
| -rw-r--r-- | intern/cycles/device/device.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 40d17b7f3d6..9dce7aa65df 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -74,6 +74,10 @@ std::ostream& operator <<(std::ostream &os, << string_from_bool(requested_features.use_principled) << std::endl; os << "Use Denoising: " << string_from_bool(requested_features.use_denoising) << std::endl; + os << "Use Displacement: " + << string_from_bool(requested_features.use_true_displacement) << std::endl; + os << "Use Background Light: " + << string_from_bool(requested_features.use_background_light) << std::endl; return os; } |