[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27636] trunk/blender/source/blender: OK, compiling doesn't mean it runs, now it should really be fixed, as I don' t use NAN directly anymore.
Joerg Mueller
nexyon at gmail.com
Sun Mar 21 01:04:51 CET 2010
Revision: 27636
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27636
Author: nexyon
Date: 2010-03-21 01:04:50 +0100 (Sun, 21 Mar 2010)
Log Message:
-----------
OK, compiling doesn't mean it runs, now it should really be fixed, as I don't use NAN directly anymore.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_math_base.h
trunk/blender/source/blender/editors/screen/screen_ops.c
Modified: trunk/blender/source/blender/blenlib/BLI_math_base.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_math_base.h 2010-03-20 23:43:50 UTC (rev 27635)
+++ trunk/blender/source/blender/blenlib/BLI_math_base.h 2010-03-21 00:04:50 UTC (rev 27636)
@@ -69,10 +69,6 @@
#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))
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2010-03-20 23:43:50 UTC (rev 27635)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2010-03-21 00:04:50 UTC (rev 27636)
@@ -2401,17 +2401,14 @@
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
{
More information about the Bf-blender-cvs
mailing list