Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-05-23 13:36:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-05-23 13:36:31 +0300
commit065c052cfb40608aa4bfe78b2284749d64200e01 (patch)
tree2c912563450aadabb9de8c12ef28f851f23e05fb /intern/cycles/render/session.cpp
parentcbbb021596c71f65862216ca381ab2054c6c6c2e (diff)
Cycles: Fix missing volumes support for feature-adaptive viewport render
Diffstat (limited to 'intern/cycles/render/session.cpp')
-rw-r--r--intern/cycles/render/session.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 63037311889..76979e9ba3e 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -610,17 +610,17 @@ DeviceRequestedFeatures Session::get_requested_device_features()
/* TODO(sergey): Consider moving this to the Scene level. */
DeviceRequestedFeatures requested_features;
requested_features.experimental = params.experimental;
+
+ requested_features.max_closure = get_max_closure_count();
+ scene->shader_manager->get_requested_features(
+ scene,
+ &requested_features);
if(!params.background) {
+ /* Avoid too much re-compilations for viewport render. */
requested_features.max_closure = 64;
requested_features.max_nodes_group = NODE_GROUP_LEVEL_MAX;
requested_features.nodes_features = NODE_FEATURE_ALL;
}
- else {
- requested_features.max_closure = get_max_closure_count();
- scene->shader_manager->get_requested_features(
- scene,
- &requested_features);
- }
/* This features are not being tweaked as often as shaders,
* so could be done selective magic for the viewport as well.