diff options
| author | Simon Clitherow <aphex@nildram.co.uk> | 2003-10-21 00:12:01 +0400 |
|---|---|---|
| committer | Simon Clitherow <aphex@nildram.co.uk> | 2003-10-21 00:12:01 +0400 |
| commit | fd3be2e3ef97282908a756bf61d9ef410ba30c9a (patch) | |
| tree | da83052c5911ad9cdfbb157190e1a1aef36e107e /source/blender/src/editseq.c | |
| parent | bac66d0a19f5dc0b52b3673c0fc15a90e8f61ace (diff) | |
added sequence editor pull-down menus.
TODO: fix "Enter/Exit Meta Strip" to work correctly for nested
meta strips.
Diffstat (limited to 'source/blender/src/editseq.c')
| -rw-r--r-- | source/blender/src/editseq.c | 57 |
1 files changed, 53 insertions, 4 deletions
diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index a4cdd489f57..a8bbc01dc2a 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -952,9 +952,58 @@ void add_sequence(int type) int cfra, machine; short nr, event, mval[2]; char *str; - - event= pupmenu("Add sequence%t|Images%x1|Movie%x102|Audio%x103|Scene%x101|Plugin%x10|Cross%x2|GammaCross%x3|Add%x4|Sub%x5|Mul%x6|AlphaOver%x7|AlphaUnder%x8|AlphaOverDrop%x9"); - + + if (type >= 0){ + /* bypass pupmenu for calls from menus (aphex) */ + switch(type){ + case SEQ_SCENE: + event = 101; + break; + case SEQ_IMAGE: + event = 1; + break; + case SEQ_MOVIE: + event = 102; + break; + case SEQ_SOUND: + event = 103; + break; + case SEQ_PLUGIN: + event = 10; + break; + case SEQ_CROSS: + event = 2; + break; + case SEQ_ADD: + event = 4; + break; + case SEQ_SUB: + event = 5; + break; + case SEQ_ALPHAOVER: + event = 7; + break; + case SEQ_ALPHAUNDER: + event = 8; + break; + case SEQ_GAMCROSS: + event = 3; + break; + case SEQ_MUL: + event = 6; + break; + case SEQ_OVERDROP: + event = 9; + break; + default: + event = 0; + break; + } + } + else { + event= pupmenu("Add sequence%t|Images%x1|Movie%x102|Audio%x103|Scene%x101|Plugin%x10|Cross%x2|GammaCross%x3|Add%x4|Sub%x5|Mul%x6|AlphaOver%x7|AlphaUnder%x8|AlphaOverDrop%x9"); + } + if(event<1) return; if(G.scene->ed==0) { @@ -1560,7 +1609,7 @@ void un_meta(void) } -static void exit_meta(void) +void exit_meta(void) { Sequence *seq; MetaStack *ms; |