diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-03-21 03:04:50 +0300 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-03-21 03:04:50 +0300 |
| commit | 42a0ef4dcfca7934329cd3c0b911f9d895582efc (patch) | |
| tree | 8771c76db6a56466a420fd994658f45c1aa9d5e7 /source/blender | |
| parent | d55cf90bb6330899b97079c07f8344a804389468 (diff) | |
OK, compiling doesn't mean it runs, now it should really be fixed, as I don't use NAN directly anymore.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenlib/BLI_math_base.h | 4 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index b080aa6b5f0..c143c44c594 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -69,10 +69,6 @@ extern "C" { #ifndef M_LN10 #define M_LN10 2.30258509299404568402 #endif -#ifndef NAN -static const unsigned long __qnan__ = 0x7fc00000UL; -#define NAN ((const float) __qnan__) -#endif #ifndef sqrtf #define sqrtf(a) ((float)sqrt(a)) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 31df55b6818..ddf838f2535 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2401,17 +2401,14 @@ static int screen_animation_step(bContext *C, wmOperator *op, wmEvent *event) ScreenAnimData *sad= wt->customdata; ScrArea *sa; int sync; - float time = NAN; + float time; /* sync, don't sync, or follow scene setting */ if(sad->flag & ANIMPLAY_FLAG_SYNC) sync= 1; else if(sad->flag & ANIMPLAY_FLAG_NO_SYNC) sync= 0; else sync= (scene->flag & SCE_FRAME_DROP); - if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag & ANIMPLAY_FLAG_REVERSE)) - time = sound_sync_scene(scene); - - if(finite(time)) + if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag & ANIMPLAY_FLAG_REVERSE) && finite(time = sound_sync_scene(scene))) scene->r.cfra = floor(time * FPS); else { |