forked from bartvdbraak/blender
Cosmetic change: the FFMPEG options for HD sound/movie are hidden behind
the #ifdef now, so it won't arise questionmarks in releases.
This commit is contained in:
parent
b709a08abc
commit
b4e787cb5c
@ -1230,9 +1230,13 @@ void add_sequence(int type)
|
||||
event= pupmenu("Add Sequence Strip%t"
|
||||
"|Images%x1"
|
||||
"|Movie%x102"
|
||||
#ifdef WITH_FFMPEG
|
||||
"|Movie + Audio (HD)%x105"
|
||||
"|Audio (RAM)%x103"
|
||||
"|Audio (HD)%x104"
|
||||
#else
|
||||
"|Audio (Wav)%x103"
|
||||
#endif
|
||||
"|Scene%x101"
|
||||
"|Plugin%x10"
|
||||
"|Cross%x2"
|
||||
|
@ -300,12 +300,18 @@ static uiBlock *seq_addmenu(void *arg_unused)
|
||||
|
||||
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
|
||||
|
||||
#ifdef WITH_FFMPEG
|
||||
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Audio (RAM)", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
|
||||
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Audio (HD)", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 3, "");
|
||||
#else
|
||||
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Audio (Wav)", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
|
||||
#endif
|
||||
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Scene", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 4, "");
|
||||
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Images", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
|
||||
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Movie", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
|
||||
#ifdef WITH_FFMPEG
|
||||
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Movie + Audio (HD)", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 5, "");
|
||||
#endif
|
||||
|
||||
if(curarea->headertype==HEADERTOP) {
|
||||
uiBlockSetDirection(block, UI_DOWN);
|
||||
|
Loading…
Reference in New Issue
Block a user