diff options
Diffstat (limited to 'source/blender/editors/space_sequencer')
4 files changed, 38 insertions, 19 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index a9ae158d162..5452bd9cc80 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -93,18 +93,26 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag) { PropertyRNA *prop; - if (flag & SEQPROP_STARTFRAME) - RNA_def_int(ot->srna, "frame_start", 0, INT_MIN, INT_MAX, "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX); + if (flag & SEQPROP_STARTFRAME) { + RNA_def_int(ot->srna, "frame_start", 0, INT_MIN, INT_MAX, + "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX); + } - if (flag & SEQPROP_ENDFRAME) - RNA_def_int(ot->srna, "frame_end", 0, INT_MIN, INT_MAX, "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); /* not usual since most strips have a fixed length */ + if (flag & SEQPROP_ENDFRAME) { + /* not usual since most strips have a fixed length */ + RNA_def_int(ot->srna, "frame_end", 0, INT_MIN, INT_MAX, + "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); + } - RNA_def_int(ot->srna, "channel", 1, 1, MAXSEQ, "Channel", "Channel to place this strip into", 1, MAXSEQ); + RNA_def_int(ot->srna, "channel", 1, 1, MAXSEQ, + "Channel", "Channel to place this strip into", 1, MAXSEQ); - RNA_def_boolean(ot->srna, "replace_sel", 1, "Replace Selection", "Replace the current selection"); + RNA_def_boolean(ot->srna, "replace_sel", 1, + "Replace Selection", "Replace the current selection"); /* only for python scripts which import strips and place them after */ - prop = RNA_def_boolean(ot->srna, "overlap", 0, "Allow Overlap", "Don't correct overlap on new sequence strips"); + prop = RNA_def_boolean(ot->srna, "overlap", 0, + "Allow Overlap", "Don't correct overlap on new sequence strips"); RNA_def_property_flag(prop, PROP_HIDDEN); } @@ -190,11 +198,13 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, bContext *C, wmOperato seq_load->len = 1; // images only, if endframe isn't set! if ((prop = RNA_struct_find_property(op->ptr, "filepath"))) { - RNA_property_string_get(op->ptr, prop, seq_load->path); /* full path, file is set by the caller */ + /* full path, file is set by the caller */ + RNA_property_string_get(op->ptr, prop, seq_load->path); is_file = 1; } else if ((prop = RNA_struct_find_property(op->ptr, "directory"))) { - RNA_property_string_get(op->ptr, prop, seq_load->path); /* full path, file is set by the caller */ + /* full path, file is set by the caller */ + RNA_property_string_get(op->ptr, prop, seq_load->path); is_file = 0; } @@ -249,7 +259,8 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, bContext *C, wmOperato seq_load->views_format = imf->views_format; seq_load->flag |= SEQ_USE_VIEWS; - /* operator custom data is always released after the SeqLoadInfo, no need to handle the memory here */ + /* operator custom data is always released after the SeqLoadInfo, + * no need to handle the memory here */ seq_load->stereo3d_format = &imf->stereo3d_format; } } diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 9593ca4a6e3..38243638943 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -648,7 +648,8 @@ static void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq, u immUniformColor3ubvAlpha(col, col[3] + 50); - imm_draw_box_wire_2d(pos, (float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1); /* outline */ + /* outline */ + imm_draw_box_wire_2d(pos, (float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1); } if (seq->endofs) { immUniformColor4ubv(col); @@ -656,7 +657,8 @@ static void draw_sequence_extensions(Scene *scene, ARegion *ar, Sequence *seq, u immUniformColor3ubvAlpha(col, col[3] + 50); - imm_draw_box_wire_2d(pos, x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM); /* outline */ + /* outline */ + imm_draw_box_wire_2d(pos, x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM); } if (seq->startofs || seq->endofs) { @@ -1565,7 +1567,8 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar) /* loop through twice, first unselected, then selected */ for (j = 0; j < 2; j++) { Sequence *seq; - int outline_tint = (j) ? -60 : -150; /* highlighting around strip edges indicating selection */ + /* highlighting around strip edges indicating selection */ + int outline_tint = (j) ? -60 : -150; /* loop through strips, checking for those that are visible */ for (seq = ed->seqbasep->first; seq; seq = seq->next) { @@ -1585,7 +1588,8 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar) sel = SELECT; } - /* draw the last selected last (i.e. 'active' in other parts of Blender), removes some overlapping error */ + /* draw the last selected last (i.e. 'active' in other parts of Blender), + * removes some overlapping error */ if (last_seq) draw_seq_strip(C, sseq, scene, ar, last_seq, 120, pixelx); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index f0d5d6d00f7..8c3639344f3 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -402,9 +402,11 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[ handsize = seq->handsize; displen = (float)abs(seq->startdisp - seq->enddisp); - if (displen / pixelx > 16) { /* don't even try to grab the handles of small strips */ - /* Set the max value to handle to 1/3 of the total len when its less than 28. - * This is important because otherwise selecting handles happens even when you click in the middle */ + /* don't even try to grab the handles of small strips */ + if (displen / pixelx > 16) { + /* Set the max value to handle to 1/3 of the total len when its + * less than 28. This is important because otherwise selecting + * handles happens even when you click in the middle. */ if ((displen / 3) < 30 * pixelx) { handsize = displen / 3; @@ -2401,7 +2403,8 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) strip_new->us = 1; /* new stripdata (only one element now!) */ - /* Note this assume all elements (images) have the same dimension, since we only copy the name here. */ + /* Note this assume all elements (images) have the same dimension, + * since we only copy the name here. */ se_new = MEM_reallocN(strip_new->stripdata, sizeof(*se_new)); BLI_strncpy(se_new->name, se->name, sizeof(se_new->name)); strip_new->stripdata = se_new; diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c index 433f1ca8ee5..fcd192fe7bc 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.c +++ b/source/blender/editors/space_sequencer/sequencer_select.c @@ -351,7 +351,8 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, const wmEvent *e marker->flag |= SELECT; } else { - /* deselect_markers(0, 0); */ /* XXX, in 2.4x, seq selection used to deselect all, need to re-thnik this for 2.5 */ + /* XXX, in 2.4x, seq selection used to deselect all, need to re-thnik this for 2.5 */ + /* deselect_markers(0, 0); */ marker->flag |= SELECT; } |