diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-02-11 16:57:41 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-02-11 16:57:41 +0300 |
| commit | 30f65b54a78edc2a974ba93fefa86534fe2b7ff4 (patch) | |
| tree | 030cf43b7c2cbd649a2e8758bf319a5b76a29aef /intern/cycles/bvh/bvh_optix.h | |
| parent | 9052c6fafa87654c9a45ce0d5b9ecee073ec1a5b (diff) | |
| parent | 3657bb514130ce2d28c407432d6f10202a68c92a (diff) | |
Merge branch 'master' into draw-colormanagementdraw-colormanagement
Diffstat (limited to 'intern/cycles/bvh/bvh_optix.h')
| -rw-r--r-- | intern/cycles/bvh/bvh_optix.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/bvh/bvh_optix.h b/intern/cycles/bvh/bvh_optix.h index 35033fe635f..e4745b093b5 100644 --- a/intern/cycles/bvh/bvh_optix.h +++ b/intern/cycles/bvh/bvh_optix.h @@ -26,11 +26,16 @@ CCL_NAMESPACE_BEGIN +class Geometry; +class Optix; + class BVHOptiX : public BVH { friend class BVH; public: - BVHOptiX(const BVHParams ¶ms, const vector<Mesh *> &meshes, const vector<Object *> &objects); + BVHOptiX(const BVHParams ¶ms, + const vector<Geometry *> &geometry, + const vector<Object *> &objects); virtual ~BVHOptiX(); virtual void build(Progress &progress, Stats *) override; |