diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-26 22:21:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-26 22:21:34 +0400 |
| commit | d33eb704f6e603d54ac3d0556ebcabf487356209 (patch) | |
| tree | f32c31a01fcf7f67a3ba35b740e8e0c857dcbc2a /source | |
| parent | 52310bd4a799e90dda3e589b7e863c217df0fd4e (diff) | |
code cleanup: quiet warning for dead assignment.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index e74bda87a43..5169d823bd8 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -1641,6 +1641,7 @@ static void viewzoom_apply(ViewOpsData *vod, int x, int y, const short viewzoom, CLAMP(vod->rv3d->camzoom, RV3D_CAMZOOM_MIN, RV3D_CAMZOOM_MAX); } + if (viewzoom == USER_ZOOM_CONT) { double time = PIL_check_seconds_timer(); float time_step = (float)(time - vod->timer_lastdraw); @@ -1689,8 +1690,10 @@ static void viewzoom_apply(ViewOpsData *vod, int x, int y, const short viewzoom, } if (use_cam_zoom) { + /* zfac is ignored in this case, see below */ +#if 0 zfac = vod->camzoom0 * (2.0f * ((len2 / len1) - 1.0f) + 1.0f) / vod->rv3d->camzoom; - zfac = 0; +#endif } else { zfac = vod->dist0 * (2.0f * ((len2 / len1) - 1.0f) + 1.0f) / vod->rv3d->dist; |