diff options
| author | Matt Ebb <matt@mke3.net> | 2008-11-26 03:47:38 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2008-11-26 03:47:38 +0300 |
| commit | d6ba3472667526faf480f59b58aab3eb45239d23 (patch) | |
| tree | 995f7b5b4a1dfa399973073102e1861c6218df71 | |
| parent | 00fae51fc13d2a10d254ca85a9d25e1420ce099c (diff) | |
* Added a new Timeline menu entry: Playback -> Sync Playback to Frames/Sec. It's
more convenient and sensible to find this feature, than over in the audio settings
(dropping frames in playback is not just for audio!)
| -rw-r--r-- | source/blender/src/header_time.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/src/header_time.c b/source/blender/src/header_time.c index 574e0b3a9f1..02bdda86b4e 100644 --- a/source/blender/src/header_time.c +++ b/source/blender/src/header_time.c @@ -160,6 +160,9 @@ static void do_time_redrawmenu(void *arg, int event) if(event==1001) { button(&G.scene->r.frs_sec,1,120,"FPS:"); } + else if(event==1002) { + G.scene->audio.flag ^= AUDIO_SYNC; + } } } @@ -202,7 +205,11 @@ static uiBlock *time_redrawmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - sprintf(str, "Set Frames/Sec (%d/%f)", G.scene->r.frs_sec, G.scene->r.frs_sec_base); + if(G.scene->audio.flag & AUDIO_SYNC) icon= ICON_CHECKBOX_HLT; + else icon= ICON_CHECKBOX_DEHLT; + uiDefIconTextBut(block, BUTM, 1, icon, "Sync Playback to Frames/Sec", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1002, ""); + + sprintf(str, "Set Frames/Sec (%d/%2f)", G.scene->r.frs_sec, G.scene->r.frs_sec_base); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, str, 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1001, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); |