diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 11:36:37 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-03 11:36:37 +0400 |
| commit | beb4d385bb2486c6046f17e8aff2a77cdf5adb05 (patch) | |
| tree | 8a5c3d2aee7e733e5f1d36e2272ea384dab45265 /source/blender/editors/space_view3d/view3d_ruler.c | |
| parent | fc3c13c309d065888da3eb864cb13b4feef0f584 (diff) | |
use floats for transform snapping distance comparisons
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_ruler.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index ef8c2b5eff6..57649459602 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -65,7 +65,7 @@ static bool ED_view3d_snap_co(bContext *C, float r_co[3], const float co_ss[2], bool use_vert, bool use_edge, bool use_face) { TransInfo t = {0}; - int dist = 12; /* snap dist */ + float dist_px = 12; /* snap dist */ float r_no_dummy[3]; bool ret = false; char backup_snap_mode; @@ -83,15 +83,15 @@ static bool ED_view3d_snap_co(bContext *C, float r_co[3], const float co_ss[2], /* try snap edge, then face if it fails */ if (use_vert) { t.scene->toolsettings->snap_mode = SCE_SNAP_MODE_VERTEX; - ret = snapObjectsTransform(&t, co_ss, &dist, r_co, r_no_dummy, SNAP_ALL); + ret = snapObjectsTransform(&t, co_ss, &dist_px, r_co, r_no_dummy, SNAP_ALL); } if (use_edge && (ret == false)) { t.scene->toolsettings->snap_mode = SCE_SNAP_MODE_EDGE; - ret = snapObjectsTransform(&t, co_ss, &dist, r_co, r_no_dummy, SNAP_ALL); + ret = snapObjectsTransform(&t, co_ss, &dist_px, r_co, r_no_dummy, SNAP_ALL); } if (use_face && (ret == false)) { t.scene->toolsettings->snap_mode = SCE_SNAP_MODE_FACE; - ret = snapObjectsTransform(&t, co_ss, &dist, r_co, r_no_dummy, SNAP_ALL); + ret = snapObjectsTransform(&t, co_ss, &dist_px, r_co, r_no_dummy, SNAP_ALL); } t.scene->toolsettings->snap_mode = backup_snap_mode; |