diff options
author | lazydodo <github@lazydodo.com> | 2016-12-09 18:28:04 +0300 |
---|---|---|
committer | lazydodo <github@lazydodo.com> | 2016-12-09 18:28:04 +0300 |
commit | 5a8b5a0377781b5d03b39543a58175d8f4bc2bab (patch) | |
tree | 1a3c7ef2ab0c70de328671eafcfa92a3daced4cf /intern/cycles/device | |
parent | 1846a7884974a3cde5ce62ee1faaa8295647398d (diff) |
Land D2339 by bliblu bli
Diffstat (limited to 'intern/cycles/device')
-rw-r--r-- | intern/cycles/device/device.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/device.h | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index ff9387b0a8a..31c99f49d6d 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -64,6 +64,8 @@ std::ostream& operator <<(std::ostream &os, << string_from_bool(requested_features.use_integrator_branched) << std::endl; os << "Use Patch Evaluation: " << string_from_bool(requested_features.use_patch_evaluation) << std::endl; + os << "Use Transparent Shadows: " + << string_from_bool(requested_features.use_transparent) << std::endl; return os; } diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 988ad10607d..ccee25ae34e 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -117,6 +117,9 @@ public: /* Use OpenSubdiv patch evaluation */ bool use_patch_evaluation; + + /* Use Transparent shadows */ + bool use_transparent; DeviceRequestedFeatures() { @@ -133,6 +136,7 @@ public: use_volume = false; use_integrator_branched = false; use_patch_evaluation = false; + use_transparent = false; } bool modified(const DeviceRequestedFeatures& requested_features) @@ -148,7 +152,8 @@ public: use_subsurface == requested_features.use_subsurface && use_volume == requested_features.use_volume && use_integrator_branched == requested_features.use_integrator_branched && - use_patch_evaluation == requested_features.use_patch_evaluation); + use_patch_evaluation == requested_features.use_patch_evaluation && + use_transparent == requested_features.use_transparent); } /* Convert the requested features structure to a build options, @@ -189,6 +194,9 @@ public: if(!use_patch_evaluation) { build_options += " -D__NO_PATCH_EVAL__"; } + if(!use_transparent) { + build_options += " -D__NO_TRANSPARENT__"; + } return build_options; } }; |