[Bf-blender-cvs] [434ae40] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 434ae40d635907c1d4f82b65fac1efaebfc5401b
Author: Antony Riakiotakis
Date:   Fri May 22 12:49:26 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB434ae40d635907c1d4f82b65fac1efaebfc5401b

Merge branch 'master' into gooseberry

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

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



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

diff --cc source/blender/windowmanager/intern/wm_playanim.c
index 0766043,c2594cc..55983be
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@@ -1419,14 -1281,9 +1419,16 @@@ static char *wm_main_playanim_intern(in
  #endif
  
  	BLI_freelistN(&picsbase);
 -
+ 	BLI_freelistN(&inmempicsbase);
+ 	added_images = 0;
 +
 +#ifdef WITH_AUDASPACE
 +	if (playback_handle)
 +		AUD_stop(playback_handle);
 +	AUD_unload(source);
 +	AUD_exit();
 +#endif
 +
  #if 0 // XXX25
  	free_blender();
  #else