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/scene.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/scene.h')
-rw-r--r-- | intern/cycles/render/scene.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h index 94fbbc44d1d..d657e48e478 100644 --- a/intern/cycles/render/scene.h +++ b/intern/cycles/render/scene.h @@ -18,6 +18,7 @@ #define __SCENE_H__ #include "image.h" +#include "shader.h" #include "device_memory.h" @@ -121,7 +122,7 @@ public: class SceneParams { public: ShadingSystem shadingsystem; - BVHType bvh_type; + enum BVHType { BVH_DYNAMIC, BVH_STATIC } bvh_type; bool use_bvh_cache; bool use_bvh_spatial_split; bool use_qbvh; @@ -129,7 +130,7 @@ public: SceneParams() { - shadingsystem = SVM; + shadingsystem = SHADINGSYSTEM_SVM; bvh_type = BVH_DYNAMIC; use_bvh_cache = false; use_bvh_spatial_split = false; |