archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OK, compiling doesn't mean it runs, now it should really be fixed, as I don't use NAN directly anymore.

Browse Source
This commit is contained in:
Joerg Mueller
2010-03-21 00:04:50 +00:00
parent d55cf90bb6
commit 42a0ef4dcf
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/BLI_math_base.h
View File

@@ -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))

7
source/blender/editors/screen/screen_ops.c
View File

@@ -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
{