diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-01-26 12:13:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-01-26 12:13:15 +0300 |
| commit | bf05827319f07d7a7b34ff34d0556cb54f6284d9 (patch) | |
| tree | 316ef06abbd79f761dfb467937c1392132d053d8 /source/blender/editors/space_sequencer/sequencer_intern.h | |
| parent | 87627374000b7de7445736a7239a3f2b168ce7eb (diff) | |
* Added WM_operator_filesel which can be used for an operators invoke function (like WM_operator_confirm).
It opens the files selector if "filename" property has not been set, else it executes the operator directly. Brecht, you might want to check, currently only sequencer add operators use it.
* Added back Effects menu back, replaced SEQUENCER_OT_add_color_strip with SEQUENCER_OT_add_effect_strip.
* Made sequencer header use operator UI functions.
* gcc complains when char's are used as array indicies when they are not explicitly signed/unsigned, corrected previous change for vpaint to silence this error.
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_intern.h')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_intern.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index f83acdd0eba..209ad4f7131 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -21,13 +21,16 @@ * All rights reserved. * * - * Contributor(s): Blender Foundation + * Contributor(s): Blender Foundation, Campbell Barton * * ***** END GPL LICENSE BLOCK ***** */ #ifndef ED_SEQUENCER_INTERN_H #define ED_SEQUENCER_INTERN_H +#include "RNA_access.h" +#include "DNA_sequence_types.h" + /* internal exports only */ struct Sequence; @@ -58,9 +61,12 @@ void deselect_all_seq(struct Scene *scene); void recurs_sel_seq(struct Sequence *seqm); int event_to_efftype(int event); void set_last_seq(struct Scene *scene, struct Sequence *seq); -int seq_effect_find_selected(struct Scene *scene, struct Sequence *activeseq, int type, struct Sequence **selseq1, struct Sequence **selseq2, struct Sequence **selseq3); +int seq_effect_find_selected(struct Scene *scene, struct Sequence *activeseq, int type, struct Sequence **selseq1, struct Sequence **selseq2, struct Sequence **selseq3, char **error_str); struct Sequence *alloc_sequence(struct ListBase *lb, int cfra, int machine); +/* externs */ +extern EnumPropertyItem sequencer_prop_effect_types[]; + /* operators */ struct wmOperatorType; struct wmWindowManager; @@ -93,11 +99,11 @@ void SEQUENCER_OT_select_invert(struct wmOperatorType *ot); /* sequencer_select.c */ -void SEQUENCER_OT_add_color_strip(struct wmOperatorType *ot); void SEQUENCER_OT_add_scene_strip(struct wmOperatorType *ot); void SEQUENCER_OT_add_movie_strip(struct wmOperatorType *ot); void SEQUENCER_OT_add_sound_strip(struct wmOperatorType *ot); void SEQUENCER_OT_add_image_strip(struct wmOperatorType *ot); +void SEQUENCER_OT_add_effect_strip(struct wmOperatorType *ot); /* RNA enums, just to be more readable */ enum { |