diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-12 11:37:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-01-12 12:09:00 +0300 |
| commit | c6c223ade6470e7a9b61ea4a4a3ab6ed62abe79d (patch) | |
| tree | fb9323466d1c45ff6a99db96fc649fe3e6374249 /source/blender/blenkernel/intern/constraint.c | |
| parent | 90250f856817b68f29924be8a60152ec3a2486a8 (diff) | |
Fix T47164: [Scene.raycast] - True result when it should be False.
We cannot use FLT_MAX as initi distance for raycast...
Renamed TRANSFORM_DIST_MAX_RAY to BVH_RAYCAST_DIST_MAX, moved it into BLI_kdopbvh,
and use in RNA raycast callbacks (and all other places using that API).
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index ec3dd9272e1..dabe606fa55 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3478,7 +3478,7 @@ static void shrinkwrap_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstra /* TODO should use FLT_MAX.. but normal projection doenst yet supports it */ hit.index = -1; - hit.dist = (scon->projLimit == 0.0f) ? 100000.0f : scon->projLimit; + hit.dist = (scon->projLimit == 0.0f) ? BVH_RAYCAST_DIST_MAX : scon->projLimit; switch (scon->projAxis) { case OB_POSX: case OB_POSY: case OB_POSZ: @@ -4123,7 +4123,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase bvhtree_from_mesh_looptri(&treeData, target, 0.0f, 4, 6); - hit.dist = FLT_MAX; + hit.dist = BVH_RAYCAST_DIST_MAX; hit.index = -1; result = BLI_bvhtree_ray_cast(treeData.tree, ray_start, ray_nor, 0.0f, &hit, treeData.raycast_callback, &treeData); |