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/session.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/session.h')
| -rw-r--r-- | intern/cycles/render/session.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 1e625158652..2d29015863c 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -24,6 +24,7 @@ #include "util_progress.h" #include "util_stats.h" #include "util_thread.h" +#include "util_types.h" #include "util_vector.h" CCL_NAMESPACE_BEGIN @@ -59,7 +60,7 @@ public: double reset_timeout; double text_timeout; - enum { OSL, SVM } shadingsystem; + ShadingSystem shadingsystem; SessionParams() { |