diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-03 20:31:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-03 20:31:46 +0400 |
commit | a2c182e9233333fc3b8ff40d352113ec95e7e30c (patch) | |
tree | 37a9e08f4e6c4bf794aa0c8c15af875299db4a1b /source/blender/editors/space_sequencer | |
parent | 86cec98f9e1523ed41b67ef998174289dbae9b83 (diff) |
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
Diffstat (limited to 'source/blender/editors/space_sequencer')
4 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 7bc8600c11c..f740a3c4875 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -167,10 +167,10 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x2, float y2, float stepsize) { /* - x1 is the starting x value to draw the wave, - x2 the end x value, same for y1 and y2 - stepsize is width of a pixel. - */ + * x1 is the starting x value to draw the wave, + * x2 the end x value, same for y1 and y2 + * stepsize is width of a pixel. + */ if(seq->flag & SEQ_AUDIO_DRAW_WAVEFORM) { int i, j, pos; @@ -478,7 +478,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) draw_shadedstrip(seq, col, x1, y1, (float)(seq->start), y2); /* feint pinstripes, helps see exactly which is extended and which isn't, - * especially when the extension is very small */ + * especially when the extension is very small */ if (seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 24); else UI_GetColorPtrShade3ubv(col, col, -16); @@ -496,7 +496,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq) draw_shadedstrip(seq, col, (float)(seq->start+seq->len), y1, x2, y2); /* feint pinstripes, helps see exactly which is extended and which isn't, - * especially when the extension is very small */ + * especially when the extension is very small */ if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, 24); else UI_GetColorPtrShade3ubv(col, col, -16); @@ -637,10 +637,10 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa } /* -Draw a sequence strip, bounds check already made -ARegion is currently only used to get the windows width in pixels -so wave file sample drawing precision is zoom adjusted -*/ + * Draw a sequence strip, bounds check already made + * ARegion is currently only used to get the windows width in pixels + * so wave file sample drawing precision is zoom adjusted + */ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline_tint, float pixelx) { View2D *v2d= &ar->v2d; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index fad402a6787..f05068cac59 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -414,7 +414,7 @@ Sequence *find_nearest_seq(Scene *scene, View2D *v2d, int *hand, const int mval[ if (displen / pixelx > 16) { /* dont 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 then 28. - * This is important because otherwise selecting handles happens even when you click in the middle */ + * This is important because otherwise selecting handles happens even when you click in the middle */ if ((displen/3) < 30*pixelx) { handsize = displen/3; @@ -515,7 +515,7 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen } /* make sequence selection a little bit more intuitive - for 3 strips: the last-strip should be sequence3 */ + * for 3 strips: the last-strip should be sequence3 */ if (seq3 != NULL && seq2 != NULL) { Sequence *tmp = seq2; seq2 = seq3; @@ -559,7 +559,7 @@ static Sequence *del_seq_find_replace_recurs(Scene *scene, Sequence *seq) Sequence *seq1, *seq2, *seq3; /* try to find a replacement input sequence, and flag for later deletion if - no replacement can be found */ + * no replacement can be found */ if(!seq) return NULL; @@ -886,7 +886,7 @@ static void UNUSED_FUNCTION(touch_seq_files)(Scene *scene) WM_cursor_wait(0); } -/* +#if 0 static void set_filter_seq(Scene *scene) { Sequence *seq; @@ -909,7 +909,7 @@ static void set_filter_seq(Scene *scene) } SEQ_END } -*/ +#endif static void UNUSED_FUNCTION(seq_remap_paths)(Scene *scene) { @@ -980,7 +980,7 @@ static void UNUSED_FUNCTION(no_gaps)(Scene *scene) static int seq_get_snaplimit(View2D *v2d) { /* fake mouse coords to get the snap value - a bit lazy but its only done once pre transform */ + * a bit lazy but its only done once pre transform */ float xmouse, ymouse, x; int mval[2] = {24, 0}; /* 24 screen px snap */ @@ -1733,7 +1733,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) while (seq) { if((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) { /* remove seq so overlap tests dont conflict, - see seq_free_sequence below for the real free'ing */ + * see seq_free_sequence below for the real free'ing */ BLI_remlink(ed->seqbasep, seq); /* if(seq->ipo) seq->ipo->id.us--; */ /* XXX, remove fcurve and assign to split image strips */ @@ -2306,8 +2306,8 @@ static int find_next_prev_edit(Scene *scene, int cfra, int side) } /* if no sequence to the right is found and the - frame is on the start of the last sequence, - move to the end of the last sequence */ + * frame is on the start of the last sequence, + * move to the end of the last sequence */ if (frame_seq) cfra = frame_seq->enddisp; return best_seq ? best_seq->startdisp : cfra; diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index ec9f8bb36d9..bf2d9ce833e 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -188,7 +188,7 @@ void sequencer_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "SEQUENCER_OT_swap_inputs", SKEY, KM_PRESS, KM_ALT, 0); /* multicam editing keyboard layout, switch to camera 1-10 using - regular number keys */ + * regular number keys */ { int keys[] = { ONEKEY, TWOKEY, THREEKEY, FOURKEY, FIVEKEY, SIXKEY, SEVENKEY, EIGHTKEY, NINEKEY, ZEROKEY }; @@ -213,7 +213,7 @@ void sequencer_keymap(wmKeyConfig *keyconf) /* 2.4x method, now use Alt for handles and select the side based on which handle was selected */ - /* +#if 0 kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0); RNA_boolean_set(kmi->ptr, "linked_left", TRUE); kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0); @@ -235,7 +235,7 @@ void sequencer_keymap(wmKeyConfig *keyconf) kmi= WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_SHIFT|KM_ALT, 0); RNA_boolean_set(kmi->ptr, "extend", TRUE); RNA_boolean_set(kmi->ptr, "linked_right", TRUE); - */ +#endif /* 2.5 method, Alt and use selected handle */ kmi = WM_keymap_add_item(keymap, "SEQUENCER_OT_select", SELECTMOUSE, KM_PRESS, KM_ALT, 0); diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 303f6912ff1..e19382b0d64 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -572,8 +572,8 @@ void ED_spacetype_sequencer(void) BLI_addhead(&st->regiontypes, art); /* Keep as python only for now - sequencer_buttons_register(art); - */ + * sequencer_buttons_register(art); + */ /* regions: header */ art= MEM_callocN(sizeof(ARegionType), "spacetype sequencer region"); |