diff options
| author | Nathan Letwory <nathan@mcneel.com> | 2014-05-16 17:43:28 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@mcneel.com> | 2014-05-19 15:46:57 +0400 |
| commit | 9a7c4ead3f57052c911570d1b507e1f5229210c8 (patch) | |
| tree | 7477e4947f2a49d74e7601887f58f64ddaf364e4 /intern/cycles/render/scene.cpp | |
| parent | 74f77a295649b7f42ede5072c5642fd02d67c5dd (diff) | |
Move BVHType and shadingsystem enums to top-level of Cycles namespace.
Easier access of BVHType and deduplication for ShadingSystem.
Reviewers: dingto, brecht
Differential Revision: https://developer.blender.org/D534
Diffstat (limited to 'intern/cycles/render/scene.cpp')
| -rw-r--r-- | intern/cycles/render/scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp index 4f5ad439520..2cb8db5fd27 100644 --- a/intern/cycles/render/scene.cpp +++ b/intern/cycles/render/scene.cpp @@ -61,7 +61,7 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_) if(device_info_.type == DEVICE_CPU) shader_manager = ShaderManager::create(this, params.shadingsystem); else - shader_manager = ShaderManager::create(this, SceneParams::SVM); + shader_manager = ShaderManager::create(this, ShadingSystem::SVM); /* Extended image limits for CPU and GPUs */ image_manager->set_extended_image_limits(device_info_); |