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/object.cpp | |
| 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/object.cpp')
| -rw-r--r-- | intern/cycles/render/object.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index 027bfd71931..7b2ffef9b60 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -25,6 +25,7 @@ #include "util_foreach.h" #include "util_map.h" #include "util_progress.h" +#include "util_types.h" #include "util_vector.h" CCL_NAMESPACE_BEGIN @@ -388,7 +389,7 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc /* prepare for static BVH building */ /* todo: do before to support getting object level coords? */ - if(scene->params.bvh_type == SceneParams::BVH_STATIC) { + if(scene->params.bvh_type == BVHType::BVH_STATIC) { progress.set_status("Updating Objects", "Applying Static Transformations"); apply_static_transforms(dscene, scene, object_flag, progress); } |