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>2015-07-18 16:34:32 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-18 17:02:08 +0300
commit45b5bf034b053509d7175e74ddea22c658b4717e (patch)
tree138826d0ebe72d4985ada1f84e11a392243a5f7f /intern/cycles/render/session.cpp
parent36a952e3e487ede34ece9330a9ae1439364c5bdd (diff)
Cycles; Make baking a feature-specific option
This means render devices now might skip building baking kernels in cases when only actual render-related functionality is used. For now it's only implemented for OpenCL split kernel device and mainly needed to work around some compiler-specific bugs which crashes on building the kernel. Using OpenCL for baking might still crash the driver, but at least there is now higher probability of that GPU will be usable to render the scene. Real fix should actually be done in the driver side.
Diffstat (limited to 'intern/cycles/render/session.cpp')
-rw-r--r--intern/cycles/render/session.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index 57c1500628a..f3acebd33d5 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -637,6 +637,9 @@ DeviceRequestedFeatures Session::get_requested_device_features()
requested_features.use_camera_motion |= mesh->use_motion_blur;
}
+ BakeManager *bake_manager = scene->bake_manager;
+ requested_features.use_baking = bake_manager->get_baking();
+
return requested_features;
}