blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 781 Projects 19 Wiki Activity

Fix View3D glitch zooming 

Fast cursor movement could clamp the distance incorrectly.
This commit is contained in:
Campbell Barton 2014-08-25 14:16:12 +10:00
parent 1377847e7b
commit bf5361591d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -2187,10 +2187,14 @@ static void viewzoom_apply(ViewOpsData *vod, const int xy[2], const short viewzo
}
if (!use_cam_zoom) {
if (zfac != 1.0f && zfac * vod->rv3d->dist > 0.001f * vod->grid &&
zfac * vod->rv3d->dist < 10.0f * vod->far)
{
view_zoom_mouseloc(vod->ar, zfac, vod->oldx, vod->oldy);
if (zfac != 1.0f) {
const float zfac_min = dist_range[0] / vod->rv3d->dist;
const float zfac_max = dist_range[1] / vod->rv3d->dist;
CLAMP(zfac, zfac_min, zfac_max);
if (zfac != 1.0f) {
view_zoom_mouseloc(vod->ar, zfac, vod->oldx, vod->oldy);
}
}
}