diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-14 09:37:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-14 09:37:43 +0400 |
| commit | ba283d6c9be1d678210e08233916268f48ef4ee1 (patch) | |
| tree | 979ed657034ae3e6df69b4e428fe2694ccee867e /source/blender/editors/space_view3d/view3d_ruler.c | |
| parent | d2b14ed4f007d7eb1160b67c6b3722cec52df375 (diff) | |
modify snapObjectsRayEx() to use a pointer to 'ray_dist' rather then passing the dist, this is to better support multiple calls to ray-cast where only closer distances are accepted.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_ruler.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index c71617bab6a..31843e7d56c 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -95,6 +95,7 @@ static bool ED_view3d_snap_ray(bContext *C, float r_co[3], { float dist_px = 12; /* snap dist */ float r_no_dummy[3]; + float ray_dist = TRANSFORM_DIST_MAX_RAY; bool ret; Scene *scene = CTX_data_scene(C); @@ -104,7 +105,7 @@ static bool ED_view3d_snap_ray(bContext *C, float r_co[3], /* try snap edge, then face if it fails */ ret = snapObjectsRayEx(scene, NULL, v3d, ar, obedit, SCE_SNAP_MODE_FACE, - ray_start, ray_normal, v3d->far, + ray_start, ray_normal, &ray_dist, NULL, &dist_px, r_co, r_no_dummy, SNAP_ALL); return ret; |