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/render | |
parent | 1846a7884974a3cde5ce62ee1faaa8295647398d (diff) |
Land D2339 by bliblu bli
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/session.cpp | 1 | ||||
-rw-r--r-- | intern/cycles/render/shader.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 8e902243211..33721048722 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -636,6 +636,7 @@ DeviceRequestedFeatures Session::get_requested_device_features() BakeManager *bake_manager = scene->bake_manager; requested_features.use_baking = bake_manager->get_baking(); requested_features.use_integrator_branched = (scene->integrator->method == Integrator::BRANCHED_PATH); + requested_features.use_transparent &= scene->integrator->transparent_shadows; return requested_features; } diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 06b6dd969d8..335edcbe609 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -571,6 +571,9 @@ void ShaderManager::get_requested_graph_features(ShaderGraph *graph, if(node->has_surface_bssrdf()) { requested_features->use_subsurface = true; } + if(node->has_surface_transparent()) { + requested_features->use_transparent = true; + } } } |