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/util | |
| 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/util')
| -rw-r--r-- | intern/cycles/util/util_types.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index d1c9dc8398e..b1319011936 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -456,16 +456,6 @@ enum InterpolationType { INTERPOLATION_SMART = 3, }; -enum ShadingSystem { - OSL, - SVM -}; - -enum BVHType { - BVH_DYNAMIC, - BVH_STATIC -}; - /* macros */ /* hints for branch prediction, only use in code that runs a _lot_ */ |