diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-01-29 01:36:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-01-29 01:36:34 +0300 |
| commit | ce2446e3db7c7087efd6bccea203e0d952eab035 (patch) | |
| tree | 409e9259f6fa415354828d0af7c728ea318ec53a /source/blender/editors/space_sequencer/sequencer_add.c | |
| parent | 7114486e8bba4fafb8f4f0dca10140bee1e0c9fb (diff) | |
* Was missing checks for scene->ed which crashed blender when using the sequencer for the first time.
* Added WM_OT_tweak_gesture operator for select, drag
* Sequencer select operator now returns OPERATOR_FINISHED|OPERATOR_PASS_THROUGH
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_add.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index cff145c5046..60a7aaebd91 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -143,7 +143,7 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, w static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - Editing *ed= scene->ed; + Editing *ed= seq_give_editing(scene, TRUE); Scene *sce_seq; char sce_name[MAX_ID_NAME-2]; @@ -230,7 +230,7 @@ void SEQUENCER_OT_add_scene_strip(struct wmOperatorType *ot) static int sequencer_add_movie_strip_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - Editing *ed= scene->ed; + Editing *ed= seq_give_editing(scene, TRUE); struct anim *an; char filename[FILE_MAX]; @@ -317,7 +317,7 @@ void SEQUENCER_OT_add_movie_strip(struct wmOperatorType *ot) static int sequencer_add_sound_strip_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - Editing *ed= scene->ed; + Editing *ed= seq_give_editing(scene, TRUE); bSound *sound; @@ -415,7 +415,7 @@ void SEQUENCER_OT_add_sound_strip(struct wmOperatorType *ot) static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - Editing *ed= scene->ed; + Editing *ed= seq_give_editing(scene, TRUE); int tot_images= 1; //XXX FIXME, we need string arrays! @@ -506,7 +506,7 @@ void SEQUENCER_OT_add_image_strip(struct wmOperatorType *ot) static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); - Editing *ed= scene->ed; + Editing *ed= seq_give_editing(scene, TRUE); Sequence *seq; /* generic strip vars */ Strip *strip; |