[Bf-blender-cvs] [443890f] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 443890fefe37bb354af7a77d0aca861b61a10f4e
Author: Antony Riakiotakis
Date:   Wed May 27 20:05:06 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB443890fefe37bb354af7a77d0aca861b61a10f4e

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/windowmanager/intern/wm_playanim.c

===================================================================



===================================================================

diff --cc source/blender/windowmanager/intern/wm_playanim.c
index c871301,de2ecc9..d60a6f1
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@@ -868,7 -701,7 +868,8 @@@ static int ghost_event_proc(GHOST_Event
  					}
  					else {
  						swaptime /= 1.1;
+ 						swaptime = MAX2(ps->fstep / 60.0, swaptime);
 +						update_sound_fps();
  					}
  					break;
  				}
@@@ -881,7 -714,7 +882,8 @@@
  					}
  					else {
  						swaptime *= 1.1;
+ 						swaptime = MIN2(ps->fstep / 5.0, swaptime);
 +						update_sound_fps();
  					}
  					break;
  				}