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/bvh8.h | |
| parent | 9052c6fafa87654c9a45ce0d5b9ecee073ec1a5b (diff) | |
| parent | 3657bb514130ce2d28c407432d6f10202a68c92a (diff) | |
Merge branch 'master' into draw-colormanagementdraw-colormanagement
Diffstat (limited to 'intern/cycles/bvh/bvh8.h')
| -rw-r--r-- | intern/cycles/bvh/bvh8.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/bvh/bvh8.h b/intern/cycles/bvh/bvh8.h index 5f26fd423e1..d23fa528e3e 100644 --- a/intern/cycles/bvh/bvh8.h +++ b/intern/cycles/bvh/bvh8.h @@ -57,7 +57,9 @@ class BVH8 : public BVH { protected: /* constructor */ friend class BVH; - BVH8(const BVHParams ¶ms, const vector<Mesh *> &meshes, const vector<Object *> &objects); + BVH8(const BVHParams ¶ms, + const vector<Geometry *> &geometry, + const vector<Object *> &objects); /* Building process. */ virtual BVHNode *widen_children_nodes(const BVHNode *root) override; |