Cleanup: split Cycles Hair and Mesh classes, with Geometry base class

1 files changed, 6 insertions, 4 deletions

diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h
index 92082e4de86..bdde38640c9 100644
--- a/intern/cycles/bvh/bvh.h
+++ b/intern/cycles/bvh/bvh.h
@@ -33,7 +33,7 @@ struct BVHStackEntry;
 class BVHParams;
 class BoundBox;
 class LeafNode;
-class Mesh;
+class Geometry;
 class Object;
 class Progress;
 
@@ -84,11 +84,11 @@ class BVH {
  public:
   PackedBVH pack;
   BVHParams params;
-  vector<Mesh *> meshes;
+  vector<Geometry *> geometry;
   vector<Object *> objects;
 
   static BVH *create(const BVHParams &params,
-                     const vector<Mesh *> &meshes,
+                     const vector<Geometry *> &geometry,
                      const vector<Object *> &objects);
   virtual ~BVH()
   {
@@ -102,7 +102,9 @@ class BVH {
   void refit(Progress &progress);
 
  protected:
-  BVH(const BVHParams &params, const vector<Mesh *> &meshes, const vector<Object *> &objects);
+  BVH(const BVHParams &params,
+      const vector<Geometry *> &geometry,
+      const vector<Object *> &objects);
 
   /* Refit range of primitives. */
   void refit_primitives(int start, int end, BoundBox &bbox, uint &visibility);