From 0684ac93013681261e8acc5ac6296c5de785d7d8 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Mon, 19 May 2014 13:49:36 +0300 Subject: 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. --- intern/cycles/render/scene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/render/scene.cpp') 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_); -- cgit v1.2.3