diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-08-21 06:38:48 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-08-21 06:38:48 +0300 |
| commit | c5e9fabe19c8721e6c4541ee0f75bdd82accca13 (patch) | |
| tree | 0b7e8bff0f3b1b210f37724d1c0a51f956cc0b30 /intern/cycles/render/session.cpp | |
| parent | 98dfe6f80035eae4de737ac883a48da304f67665 (diff) | |
| parent | c00b2d89911e20c8ace12a9256c689e9f43cc63b (diff) | |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
This was an extremely hacky merge with a lot of rebasing and git tricks involved, I hope it works as it's supposed to.
Diffstat (limited to 'intern/cycles/render/session.cpp')
| -rw-r--r-- | intern/cycles/render/session.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index bd62bb4790d..d2eb2319363 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -705,6 +705,11 @@ DeviceRequestedFeatures Session::get_requested_device_features() } requested_features.use_object_motion |= object->use_motion | mesh->use_motion_blur; requested_features.use_camera_motion |= mesh->use_motion_blur; +#ifdef WITH_OPENSUBDIV + if(mesh->subdivision_type != Mesh::SUBDIVISION_NONE) { + requested_features.use_patch_evaluation = true; + } +#endif } BakeManager *bake_manager = scene->bake_manager; |