Commit: fa147804b86cdd860491f4ec1b0b5a401b596f79
Author: Antony Riakiotakis
Date: Thu Jun 4 17:51:21 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBfa147804b86cdd860491f4ec1b0b5a401b596f79
Make clamping able to return to exact previous values.
===================================================================
M source/blender/windowmanager/intern/wm_playanim.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_playanim.c
b/source/blender/windowmanager/intern/wm_playanim.c
index d60a6f1..f47f665 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -867,9 +867,10 @@ static int ghost_event_proc(GHOST_EventHandle evt,
GHOST_TUserDataPtr ps_void)
playanim_window_zoom(ps, 1.0f);
}
else {
- swaptime /= 1.1;
- swaptime = MAX2(ps->fstep /
60.0, swaptime);
- update_sound_fps();
+ if (swaptime > ps->fstep /
60.0) {
+ swaptime /= 1.1;
+ update_sound_fps();
+ }
}
break;
}
@@ -881,9 +882,10 @@ static int ghost_event_proc(GHOST_EventHandle evt,
GHOST_TUserDataPtr ps_void)
playanim_window_zoom(ps, -1.0f);
}
else {
- swaptime *= 1.1;
- swaptime = MIN2(ps->fstep /
5.0, swaptime);
- update_sound_fps();
+ if (swaptime < ps->fstep / 5.0)
{
+ swaptime *= 1.1;
+ update_sound_fps();
+ }
}
break;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
