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/session.h | |
| 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/session.h')
| -rw-r--r-- | intern/cycles/render/session.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 2d29015863c..4638bb8cc37 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -19,12 +19,12 @@ #include "buffers.h" #include "device.h" +#include "shader.h" #include "tile.h" #include "util_progress.h" #include "util_stats.h" #include "util_thread.h" -#include "util_types.h" #include "util_vector.h" CCL_NAMESPACE_BEGIN @@ -81,7 +81,7 @@ public: reset_timeout = 0.1; text_timeout = 1.0; - shadingsystem = SVM; + shadingsystem = SHADINGSYSTEM_SVM; tile_order = TILE_CENTER; } |