diff options
Diffstat (limited to 'source/blender/editors/space_sequencer')
5 files changed, 42 insertions, 42 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 0d7239015c9..ce4c0b6a8a4 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -793,7 +793,7 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq /* safety border */ if (sseq->mainb == SEQ_DRAW_IMG_IMBUF && - (sseq->flag & SEQ_DRAW_SAFE_MARGINS) != 0) { + (sseq->flag & SEQ_DRAW_SAFE_MARGINS) != 0) { float fac= 0.1; float x1 = v2d->tot.xmin; float y1 = v2d->tot.ymin; diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index dfc78eedf2a..3cdbc70211f 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -573,17 +573,17 @@ void change_sequence(Scene *scene) U.plugseqdir, change_plugin_seq); } else if(event==12); - /* recalculate: only new_stripdata */ + /* recalculate: only new_stripdata */ else { /* free previous effect and init new effect */ struct SeqEffectHandle sh; if (get_sequence_effect_num_inputs( - last_seq->type) - < get_sequence_effect_num_inputs( - event_to_efftype(event))) { + last_seq->type) + < get_sequence_effect_num_inputs( + event_to_efftype(event))) { error("New effect needs more " - "input strips!"); + "input strips!"); } else { sh = get_sequence_effect(last_seq); sh.free(last_seq); @@ -602,9 +602,9 @@ void change_sequence(Scene *scene) else if(last_seq->type == SEQ_IMAGE) { if(okee("Change images")) { activate_fileselect(FILE_SPECIAL, - "Select Images", - ed->act_imagedir, - reload_image_strip); + "Select Images", + ed->act_imagedir, + reload_image_strip); } } else if(last_seq->type == SEQ_MOVIE) { @@ -646,13 +646,13 @@ int seq_effect_find_selected(Scene *scene, Sequence *activeseq, int type, Sequen return 0; } if((seq != activeseq) && (seq != seq2)) { - if(seq2==0) seq2= seq; - else if(seq1==0) seq1= seq; - else if(seq3==0) seq3= seq; - else { + if(seq2==0) seq2= seq; + else if(seq1==0) seq1= seq; + else if(seq3==0) seq3= seq; + else { *error_str= "Can't apply effect to more than 3 sequence strips"; return 0; - } + } } } } @@ -716,7 +716,7 @@ void reassign_inputs_seq_effect(Scene *scene) seq_is_predecessor(seq3, last_seq) ) { //BKE_report(op->reports, RPT_ERROR, "Can't reassign inputs: no cycles allowed"); // XXX operatorify - return; + return; } last_seq->seq1 = seq1; @@ -1305,7 +1305,7 @@ static int sequencer_snap_exec(bContext *C, wmOperator *op) /* also check metas */ SEQP_BEGIN(ed, seq) { if (seq->flag & SELECT && !(seq->depth==0 && seq->flag & SEQ_LOCK) && - seq_tx_test(seq)) { + seq_tx_test(seq)) { if((seq->flag & (SEQ_LEFTSEL+SEQ_RIGHTSEL))==0) { seq->start= snap_frame-seq->startofs+seq->startstill; } else { diff --git a/source/blender/editors/space_sequencer/sequencer_intern.h b/source/blender/editors/space_sequencer/sequencer_intern.h index 557402ded92..f591afa1e34 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.h +++ b/source/blender/editors/space_sequencer/sequencer_intern.h @@ -127,17 +127,17 @@ void SEQUENCER_OT_effect_strip_add(struct wmOperatorType *ot); /* RNA enums, just to be more readable */ enum { SEQ_SIDE_NONE=0, - SEQ_SIDE_LEFT, - SEQ_SIDE_RIGHT, + SEQ_SIDE_LEFT, + SEQ_SIDE_RIGHT, SEQ_SIDE_BOTH, }; enum { - SEQ_CUT_SOFT, - SEQ_CUT_HARD, + SEQ_CUT_SOFT, + SEQ_CUT_HARD, }; enum { - SEQ_SELECTED, - SEQ_UNSELECTED, + SEQ_SELECTED, + SEQ_UNSELECTED, }; /* defines used internally */ diff --git a/source/blender/editors/space_sequencer/sequencer_scopes.c b/source/blender/editors/space_sequencer/sequencer_scopes.c index 0257ea5d9ca..d9d027823bc 100644 --- a/source/blender/editors/space_sequencer/sequencer_scopes.c +++ b/source/blender/editors/space_sequencer/sequencer_scopes.c @@ -35,16 +35,16 @@ static void rgb_to_yuv(float rgb[3], float yuv[3]) { - yuv[0]= 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]; - yuv[1]= 0.492*(rgb[2] - yuv[0]); - yuv[2]= 0.877*(rgb[0] - yuv[0]); + yuv[0]= 0.299*rgb[0] + 0.587*rgb[1] + 0.114*rgb[2]; + yuv[1]= 0.492*(rgb[2] - yuv[0]); + yuv[2]= 0.877*(rgb[0] - yuv[0]); - /* Normalize */ - yuv[1]*= 255.0/(122*2.0); - yuv[1]+= 0.5; + /* Normalize */ + yuv[1]*= 255.0/(122*2.0); + yuv[1]+= 0.5; - yuv[2]*= 255.0/(157*2.0); - yuv[2]+= 0.5; + yuv[2]*= 255.0/(157*2.0); + yuv[2]+= 0.5; } static void scope_put_pixel(unsigned char* table, unsigned char * pos) @@ -580,7 +580,7 @@ static void vectorscope_put_cross(unsigned char r, unsigned char g, rgb_to_yuv(rgb, yuv); p = tgt + 4 * (w * (int) ((yuv[2] * (h - 3) + 1)) - + (int) ((yuv[1] * (w - 3) + 1))); + + (int) ((yuv[1] * (w - 3) + 1))); if (r == 0 && g == 0 && b == 0) { r = 255; @@ -631,7 +631,7 @@ static struct ImBuf *make_vectorscope_view_from_ibuf_byte(struct ImBuf * ibuf) rgb_to_yuv(rgb, yuv); p = tgt + 4 * (w * (int) ((yuv[2] * (h - 3) + 1)) - + (int) ((yuv[1] * (w - 3) + 1))); + + (int) ((yuv[1] * (w - 3) + 1))); scope_put_pixel(wtable, (unsigned char*)p); } } @@ -681,7 +681,7 @@ static struct ImBuf *make_vectorscope_view_from_ibuf_float(struct ImBuf * ibuf) rgb_to_yuv(rgb, yuv); p = tgt + 4 * (w * (int) ((yuv[2] * (h - 3) + 1)) - + (int) ((yuv[1] * (w - 3) + 1))); + + (int) ((yuv[1] * (w - 3) + 1))); scope_put_pixel(wtable, (unsigned char*)p); } } diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index b6a099807dd..22858c4a849 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -188,15 +188,15 @@ static SpaceLink *sequencer_new(const bContext *C) /* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */ ar->v2d.keepzoom= V2D_KEEPASPECT | V2D_KEEPZOOM; ar->v2d.minzoom= 0.00001f; - ar->v2d.maxzoom= 100000.0f; - ar->v2d.tot.xmin= -960.0f; /* 1920 width centered */ - ar->v2d.tot.ymin= -540.0f; /* 1080 height centered */ - ar->v2d.tot.xmax= 960.0f; - ar->v2d.tot.ymax= 540.0f; - ar->v2d.min[0]= 0.0f; - ar->v2d.min[1]= 0.0f; - ar->v2d.max[0]= 12000.0f; - ar->v2d.max[1]= 12000.0f; + ar->v2d.maxzoom= 100000.0f; + ar->v2d.tot.xmin= -960.0f; /* 1920 width centered */ + ar->v2d.tot.ymin= -540.0f; /* 1080 height centered */ + ar->v2d.tot.xmax= 960.0f; + ar->v2d.tot.ymax= 540.0f; + ar->v2d.min[0]= 0.0f; + ar->v2d.min[1]= 0.0f; + ar->v2d.max[0]= 12000.0f; + ar->v2d.max[1]= 12000.0f; ar->v2d.cur= ar->v2d.tot; ar->v2d.align= V2D_ALIGN_FREE; ar->v2d.keeptot= V2D_KEEPTOT_FREE; |