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/render | |
| parent | f76c15efb70207cf4e92708e0565110bbae854ab (diff) | |
| parent | dabe5cd31add8aa55b9ad4bce1b591ed4e98f1a1 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/session.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index c6fe5d7c5f2..10bfbe42303 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -22,6 +22,7 @@ #include "device/device.h" #include "render/graph.h" #include "render/integrator.h" +#include "render/light.h" #include "render/mesh.h" #include "render/object.h" #include "render/scene.h" @@ -687,8 +688,11 @@ DeviceRequestedFeatures Session::get_requested_device_features() if(object->is_shadow_catcher) { requested_features.use_shadow_tricks = true; } + requested_features.use_true_displacement |= mesh->has_true_displacement(); } + requested_features.use_background_light = scene->light_manager->has_background_light(scene); + 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); |