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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-12 16:22:53 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-12 16:22:53 +0300
commit645cc3e8710b043e214931ae4110c2d86034b946 (patch)
tree366cb98a8dd9b6562ab9ff876f507008a0cacb20 /intern/cycles/render
parent8ba1c3072ca9fd3b2ab3be3bffa617c2a5cf0b7b (diff)
parente3b1ae9a8166ebb2e5255b5c1f93c383b87a7024 (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/session.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 10bfbe42303..866832333eb 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -658,11 +658,6 @@ DeviceRequestedFeatures Session::get_requested_device_features()
scene->shader_manager->get_requested_features(
scene,
&requested_features);
- if(!params.background) {
- /* Avoid too much re-compilations for viewport render. */
- requested_features.max_nodes_group = NODE_GROUP_LEVEL_MAX;
- requested_features.nodes_features = NODE_FEATURE_ALL;
- }
/* This features are not being tweaked as often as shaders,
* so could be done selective magic for the viewport as well.