diff options
author | Nathan Letwory <nathan@mcneel.com> | 2014-05-19 14:49:36 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@mcneel.com> | 2014-05-19 15:46:58 +0400 |
commit | 0684ac93013681261e8acc5ac6296c5de785d7d8 (patch) | |
tree | a0c44d4b6ba118bd56755fae76705ca7e7145123 /intern/cycles/render/scene.cpp | |
parent | 9a7c4ead3f57052c911570d1b507e1f5229210c8 (diff) |
Move ShadingSystem enum to shader.h
Add SHADINGSYSTEM_ to enum member names, so it is clear where they
are from.
Revert BVHType enum changes, as there's no need for code dedup here.
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 2cb8db5fd27..1192824626a 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, ShadingSystem::SVM); + shader_manager = ShaderManager::create(this, SHADINGSYSTEM_SVM); /* Extended image limits for CPU and GPUs */ image_manager->set_extended_image_limits(device_info_); |