diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-07-13 19:19:15 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-07-13 19:19:15 +0400 |
| commit | e86b78c47c7ebfd15ea51de99c02e45790cbf9d7 (patch) | |
| tree | 80a1227acfad33e39dd55335657849e85d636497 /source/blender/windowmanager | |
| parent | 44f1decdc01ffdf8002261c78397b68a9f40b12c (diff) | |
Merging revision 30264:30270 from my GSoC branch to trunk, logs:
Bugfix for [#22284] Blender cursor gets stuck in the timeline when scrubbing (jack transport).
Dirty hack fix for:
* [#22366] Cutting audio and meta strips with audio does not actually cut audio
* [#22639] Audio not clipped to meta bounds
Also fixed a seemingly symptomless bug in sequencer_edit.c
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index b01d2b27364..3077b25cc73 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1598,7 +1598,7 @@ void wm_event_do_handlers(bContext *C) } 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); |