diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-23 18:48:02 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-23 18:48:02 +0300 |
commit | 22bc6142c3c505de2f2a9a85941c43236f53b941 (patch) | |
tree | ca95d160581add46ded8634be4b2d2313f04863e /source/blender/blenkernel | |
parent | 409443500b299a2f2112e669e7085d3f16191e8c (diff) |
Fix T59152: dynamic topology constant detail should be in world space.
It seems more predictable, and makes more sense for future multi-object modes.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_pbvh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index 47fedb565fc..0067f63ded0 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -108,7 +108,7 @@ bool BKE_pbvh_node_raycast( bool BKE_pbvh_bmesh_node_raycast_detail( PBVHNode *node, const float ray_start[3], const float ray_normal[3], - float *depth, float *r_detail); + float *depth, float *r_edge_length); /* for orthographic cameras, project the far away ray segment points to the root node so * we can have better precision. */ diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 3369b05ea60..53dafdc9787 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1549,7 +1549,7 @@ bool pbvh_bmesh_node_raycast( bool BKE_pbvh_bmesh_node_raycast_detail( PBVHNode *node, const float ray_start[3], const float ray_normal[3], - float *depth, float *r_detail) + float *depth, float *r_edge_length) { if (node->flag & PBVH_FullyHidden) return 0; @@ -1588,7 +1588,7 @@ bool BKE_pbvh_bmesh_node_raycast_detail( float len3 = len_squared_v3v3(v_tri[2]->co, v_tri[0]->co); /* detail returned will be set to the maximum allowed size, so take max here */ - *r_detail = sqrtf(max_fff(len1, len2, len3)); + *r_edge_length = sqrtf(max_fff(len1, len2, len3)); } return hit; |