diff options
| author | Andrew Wiggin <ender79bl@gmail.com> | 2011-10-14 11:41:45 +0400 |
|---|---|---|
| committer | Andrew Wiggin <ender79bl@gmail.com> | 2011-10-14 11:41:45 +0400 |
| commit | eaff9a1c1b420dde7f291c8fb8715f18dd512f64 (patch) | |
| tree | 98b2174b93a076e685e9daadf4c4ca66276e64c4 /source/blender/windowmanager/intern | |
| parent | 13490b1ac3ee1a98a4e968555df53a4699f23f27 (diff) | |
Reverting my windows build fix because it breaks the bug fix committed in r40995
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 4055b6c7d9e..074151c9abe 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -33,6 +33,7 @@ #include <stdlib.h> #include <string.h> +#include <math.h> #include "DNA_listBase.h" #include "DNA_screen_types.h" @@ -46,7 +47,6 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" -#include "BLI_math.h" #include "BKE_blender.h" #include "BKE_context.h" @@ -1791,7 +1791,7 @@ void wm_event_do_handlers(bContext *C) if(playing == 0) { float time = sound_sync_scene(scene); - if(time != SOUND_ERR_FLT) { + if(finite(time)) { int ncfra = sound_sync_scene(scene) * (float)FPS + 0.5f; if(ncfra != scene->r.cfra) { scene->r.cfra = ncfra; |