diff options
author | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-04 01:15:35 +0300 |
---|---|---|
committer | Lukas Stockner <lukas.stockner@freenet.de> | 2016-07-04 01:15:35 +0300 |
commit | e1f266d079341c33e2db2f21b1bfe820aa4d0e18 (patch) | |
tree | abf8b2ef33441d47c047b38074b08e646ecf716a /intern/cycles/render/session.cpp | |
parent | 34e8efeceaa7e1f265e43e89c58c7edc72fcee57 (diff) | |
parent | b27322e71ee4e7e188166dd28a649d43781e9f38 (diff) |
Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising
Conflicts:
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_path_branched.h
intern/cycles/kernel/kernel_types.h
intern/cycles/render/buffers.cpp
intern/cycles/render/buffers.h
intern/cycles/render/film.cpp
intern/cycles/render/film.h
intern/cycles/render/integrator.cpp
source/blender/render/intern/source/render_result.c
Diffstat (limited to 'intern/cycles/render/session.cpp')
-rw-r--r-- | intern/cycles/render/session.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 63091a11119..ce5c962854a 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -673,17 +673,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. @@ -693,7 +693,7 @@ DeviceRequestedFeatures Session::get_requested_device_features() requested_features.use_camera_motion = scene->camera->use_motion; foreach(Object *object, scene->objects) { Mesh *mesh = object->mesh; - if(mesh->curves.size() > 0) { + if(mesh->num_curves()) { requested_features.use_hair = true; } requested_features.use_object_motion |= object->use_motion | mesh->use_motion_blur; |