diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-26 17:54:13 +0300 |
commit | 94d88df3a8954f8c9c3be3c6a4ea9dce0dceb849 (patch) | |
tree | 1b9751fb6b665de1203f079d5d2bafabd44eb007 /intern/cycles | |
parent | 115e1d441b5d005bb3c53a134d1ad2683ffb9735 (diff) | |
parent | b7a9e980a11a085a3bc7ef8e267b967197f47447 (diff) |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/bvh/bvh2.h | 4 | ||||
-rw-r--r-- | intern/cycles/bvh/bvh4.h | 4 | ||||
-rw-r--r-- | intern/cycles/bvh/bvh8.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/bvh/bvh2.h b/intern/cycles/bvh/bvh2.h index f38cdf5aca9..6afa6c21796 100644 --- a/intern/cycles/bvh/bvh2.h +++ b/intern/cycles/bvh/bvh2.h @@ -52,7 +52,7 @@ protected: virtual BVHNode *widen_children_nodes(const BVHNode *root) override; /* pack */ - void pack_nodes(const BVHNode *root); + void pack_nodes(const BVHNode *root) override; void pack_leaf(const BVHStackEntry& e, const LeafNode *leaf); @@ -81,7 +81,7 @@ protected: uint visibility0, uint visibility1); /* refit */ - void refit_nodes(); + void refit_nodes() override; void refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility); }; diff --git a/intern/cycles/bvh/bvh4.h b/intern/cycles/bvh/bvh4.h index 2a2a466c767..caa0e2c8182 100644 --- a/intern/cycles/bvh/bvh4.h +++ b/intern/cycles/bvh/bvh4.h @@ -52,7 +52,7 @@ protected: virtual BVHNode *widen_children_nodes(const BVHNode *root) override; /* pack */ - void pack_nodes(const BVHNode *root); + void pack_nodes(const BVHNode *root) override; void pack_leaf(const BVHStackEntry& e, const LeafNode *leaf); void pack_inner(const BVHStackEntry& e, const BVHStackEntry *en, int num); @@ -81,7 +81,7 @@ protected: const int num); /* refit */ - void refit_nodes(); + void refit_nodes() override; void refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility); }; diff --git a/intern/cycles/bvh/bvh8.h b/intern/cycles/bvh/bvh8.h index 84f82538c0f..277e2f2d653 100644 --- a/intern/cycles/bvh/bvh8.h +++ b/intern/cycles/bvh/bvh8.h @@ -63,7 +63,7 @@ protected: virtual BVHNode *widen_children_nodes(const BVHNode *root) override; /* pack */ - void pack_nodes(const BVHNode *root); + void pack_nodes(const BVHNode *root) override; void pack_leaf(const BVHStackEntry& e, const LeafNode *leaf); void pack_inner(const BVHStackEntry& e, const BVHStackEntry *en, int num); @@ -92,7 +92,7 @@ protected: const int num); /* refit */ - void refit_nodes(); + void refit_nodes() override; void refit_node(int idx, bool leaf, BoundBox& bbox, uint& visibility); }; |