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.h | |
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.h')
-rw-r--r-- | intern/cycles/render/scene.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 0f0bb725823..94fbbc44d1d 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -120,8 +120,8 @@ public: class SceneParams { public: - enum { OSL, SVM } shadingsystem; - enum BVHType { BVH_DYNAMIC, BVH_STATIC } bvh_type; + ShadingSystem shadingsystem; + BVHType bvh_type; bool use_bvh_cache; bool use_bvh_spatial_split; bool use_qbvh; |