Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh_intern.h')
-rw-r--r--source/blender/blenkernel/intern/pbvh_intern.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h
index 1230d3a90b6..6b3ef8eb5da 100644
--- a/source/blender/blenkernel/intern/pbvh_intern.h
+++ b/source/blender/blenkernel/intern/pbvh_intern.h
@@ -104,7 +104,7 @@ struct PBVHNode {
PBVHProxyNode *proxies;
/* Dyntopo */
- GHash *bm_faces;
+ GSet *bm_faces;
GSet *bm_unique_verts;
GSet *bm_other_verts;
float (*bm_orco)[3];
@@ -160,10 +160,10 @@ struct PBVH {
/* Dynamic topology */
BMesh *bm;
- GHash *bm_face_to_node;
- GHash *bm_vert_to_node;
float bm_max_edge_len;
float bm_min_edge_len;
+ int cd_vert_node_offset;
+ int cd_face_node_offset;
struct BMLog *bm_log;
};
@@ -181,14 +181,10 @@ bool ray_face_intersection(const float ray_start[3], const float ray_normal[3],
void pbvh_update_BB_redraw(PBVH *bvh, PBVHNode **nodes, int totnode, int flag);
/* pbvh_bmesh.c */
-int pbvh_bmesh_node_raycast(
+bool pbvh_bmesh_node_raycast(
PBVHNode *node, const float ray_start[3],
const float ray_normal[3], float *dist,
- int use_original);
-
-int pbvh_bmesh_node_raycast_detail(
- PBVHNode *node, const float ray_start[3],
- const float ray_normal[3], float *detail, float *dist);
+ bool use_original);
void pbvh_bmesh_normals_update(PBVHNode **nodes, int totnode);