Commit: 71f3a9ebda52c6bb8497654fc8f2e31269fbef4d
Author: Sergey Sharybin
Date: Mon May 23 12:36:31 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB71f3a9ebda52c6bb8497654fc8f2e31269fbef4d
Cycles: Fix missing volumes support for feature-adaptive viewport render
===================================================================
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 6303731..76979e9 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.
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
