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

[Antony Riakiotakis]

Commit: 8357040667f3008d9d0f1e33f0b0dc54ff4a3ef8
Author: Antony Riakiotakis
Date:   Tue May 19 11:20:54 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB8357040667f3008d9d0f1e33f0b0dc54ff4a3ef8

Merge branch 'master' into gooseberry

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

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



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

diff --cc source/blender/windowmanager/intern/wm_playanim.c
index 1aea27b,81e0b0e..15b7dbc
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@@ -71,12 -71,10 +71,18 @@@
  
  #include "WM_api.h"  /* only for WM_main_playanim */
  
 +#ifdef WITH_AUDASPACE
 +#include "AUD_C-API.h"
 +
 +AUD_Sound *source = NULL;
 +AUD_Handle *playback_handle = NULL;
 +double fps_movie;
+ /* simple limiter to avoid flooding memory */
++#endif
++
+ #define USE_FRAME_CACHE_LIMIT
+ #ifdef USE_FRAME_CACHE_LIMIT
+ #  define PLAY_FRAME_CACHE_MAX 30
  #endif
  
  struct PlayState;