[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30265] branches/soc-2010-nexyon/source/ blender: Bugfix for [#22284] Blender cursor gets stuck in the timeline when scrubbing (jack transport).

[Joerg Mueller]

Revision: 30265
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30265
Author:   nexyon
Date:     2010-07-13 13:50:04 +0200 (Tue, 13 Jul 2010)

Log Message:
-----------
Bugfix for [#22284] Blender cursor gets stuck in the timeline when scrubbing (jack transport).

Modified Paths:
--------------
    branches/soc-2010-nexyon/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_event_system.c

Modified: branches/soc-2010-nexyon/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/soc-2010-nexyon/source/blender/editors/screen/screen_ops.c	2010-07-13 11:14:49 UTC (rev 30264)
+++ branches/soc-2010-nexyon/source/blender/editors/screen/screen_ops.c	2010-07-13 11:50:04 UTC (rev 30265)
@@ -2448,7 +2448,7 @@
 		else sync= (scene->flag & SCE_FRAME_DROP);
 		
 		if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag & ANIMPLAY_FLAG_REVERSE) && finite(time = sound_sync_scene(scene)))
-			scene->r.cfra = floor(time * FPS);
+			scene->r.cfra = round(time * FPS);
 		else
 		{
 			if(sync) {

Modified: branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_event_system.c	2010-07-13 11:14:49 UTC (rev 30264)
+++ branches/soc-2010-nexyon/source/blender/windowmanager/intern/wm_event_system.c	2010-07-13 11:50:04 UTC (rev 30265)
@@ -1598,7 +1598,7 @@
 					}
 					
 					if(playing == 0) {
-						int ncfra = floor(sound_sync_scene(scene) * FPS);
+						int ncfra = round(sound_sync_scene(scene) * FPS);
 						if(ncfra != scene->r.cfra)	{
 							scene->r.cfra = ncfra;
 							ED_update_for_newframe(C, 1);