diff options
author | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
---|---|---|
committer | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
commit | 42b0389a9b05e51e17ba79540e88cd446b52fae7 (patch) | |
tree | ee17716640f1b1133ae2ab4ca65cd92a63d09f15 /intern/cycles/render/mesh.h | |
parent | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (diff) | |
parent | e7b698327cd91b371ff4fd43d1c117637224fded (diff) |
Merge remote-tracking branch 'origin/master' into geometry-nodesgeometry-nodes
Diffstat (limited to 'intern/cycles/render/mesh.h')
-rw-r--r-- | intern/cycles/render/mesh.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index e2746e560da..b0a16fdfd8f 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -184,9 +184,8 @@ class Mesh : public Geometry { unordered_multimap<int, int> vert_stitching_map; /* stitching index -> multiple real vert indices */ - friend class BVH; + friend class BVH2; friend class BVHBuild; - friend class BVHEmbree; friend class BVHSpatialSplit; friend class DiagSplit; friend class EdgeDice; @@ -233,6 +232,8 @@ class Mesh : public Geometry { size_t tri_offset); void pack_patches(uint *patch_data, uint vert_offset, uint face_offset, uint corner_offset); + void pack_primitives(PackedBVH &pack, int object, uint visibility) override; + void tessellate(DiagSplit *split); SubdFace get_subd_face(size_t index) const; |