diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-01-29 20:01:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-29 20:01:53 +0300 |
commit | 044d56837434125ac469da94ac7ac116dea4fc7e (patch) | |
tree | 6e753ac550e4a190f2caf419db0e5b21260887e5 /source/blender/editors/space_sequencer | |
parent | 812e5140b0b0a8e1569ceac3fac1852274ea3a2c (diff) |
edits to 26400
- use the endframe operator property
- dont use the startstill setting, gives odd results (start frame isnt the startframe)
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 2c952c847fb..13bf50b1c19 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -148,13 +148,19 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op) memset(seq_load, 0, sizeof(SeqLoadInfo)); seq_load->start_frame= RNA_int_get(op->ptr, "start_frame"); + seq_load->end_frame= seq_load->start_frame; /* un-set */ + seq_load->channel= RNA_int_get(op->ptr, "channel"); - seq_load->len= 1; // images only! + seq_load->len= 1; // images only, if endframe isnt set! RNA_string_get(op->ptr, "name", seq_load->name+2); RNA_string_get(op->ptr, "path", seq_load->path); /* full path, file is set by the caller */ + if (RNA_struct_find_property(op->ptr, "end_frame")) { + seq_load->end_frame = RNA_int_get(op->ptr, "end_frame"); + } + if (RNA_struct_find_property(op->ptr, "replace_sel") && RNA_boolean_get(op->ptr, "replace_sel")) seq_load->flag |= SEQ_LOAD_REPLACE_SEL; @@ -417,8 +423,9 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) } else { BLI_split_dirfile_basic(seq_load.path, NULL, se->name); - seq->startstill= 25; - seq->endstill= 25; + if(seq_load.start_frame < seq_load.end_frame) { + seq->endstill= seq_load.end_frame - seq_load.start_frame; + } } calc_sequence_disp(seq); |