diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-26 12:44:06 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-26 12:44:06 +0300 |
commit | 98d483196953a0979089e4e9a61f9d993ddaf87b (patch) | |
tree | 91a905662952757d95fdf876b00c35c2e061080f /source | |
parent | f1ea1da5e50d4319fe96ff75bfc75f73941e5cb1 (diff) |
cleanup: style & tips
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_eyedropper.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_curve.c | 6 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c index 7fed3772389..1294da38a41 100644 --- a/source/blender/editors/interface/interface_eyedropper.c +++ b/source/blender/editors/interface/interface_eyedropper.c @@ -328,7 +328,7 @@ void UI_OT_eyedropper_color(wmOperatorType *ot) /* identifiers */ ot->name = "Eyedropper"; ot->idname = "UI_OT_eyedropper_color"; - ot->description = "Sample a color from the Blender Window to store in a property"; + ot->description = "Sample a data-block from the 3D view"; /* api callbacks */ ot->invoke = eyedropper_invoke; diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c index 8c7c3b102e3..1f5ee708ad0 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.c +++ b/source/blender/editors/sculpt_paint/paint_curve.c @@ -329,7 +329,7 @@ void PAINTCURVE_OT_add_point(wmOperatorType *ot) { /* identifiers */ ot->name = "Add New Paint Curve Point"; - ot->description = "Add new paint curve point"; + ot->description = ot->name; ot->idname = "PAINTCURVE_OT_add_point"; /* api callbacks */ @@ -410,8 +410,8 @@ static int paintcurve_delete_point_exec(bContext *C, wmOperator *op) void PAINTCURVE_OT_delete_point(wmOperatorType *ot) { /* identifiers */ - ot->name = "Add New Paint Curve Point"; - ot->description = "Add new paint curve point"; + ot->name = "Remove Paint Curve Point"; + ot->description = ot->name; ot->idname = "PAINTCURVE_OT_delete_point"; /* api callbacks */ diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 80e3a0247c0..bf2860b819c 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -205,7 +205,7 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc BLI_mutex_lock(sound->mutex); if (!seq->sound->waveform) { - if(!(sound->flags & SOUND_FLAGS_WAVEFORM_LOADING)) { + if (!(sound->flags & SOUND_FLAGS_WAVEFORM_LOADING)) { /* prevent sounds from reloading */ seq->sound->flags |= SOUND_FLAGS_WAVEFORM_LOADING; BLI_mutex_unlock(sound->mutex); @@ -747,7 +747,7 @@ static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, AReg /* draw sound wave */ if (seq->type == SEQ_TYPE_SOUND_RAM) { - if(!(sseq->flag & SEQ_NO_WAVEFORMS)) { + if (!(sseq->flag & SEQ_NO_WAVEFORMS)) { drawseqwave(C, sseq, scene, seq, x1, y1, x2, y2, BLI_rctf_size_x(&ar->v2d.cur) / ar->winx); } } @@ -1204,22 +1204,22 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq } else if (draw_backdrop) { float aspect = BLI_rcti_size_x(&ar->winrct) / (float)BLI_rcti_size_y(&ar->winrct); - float image_aspect = viewrectx/viewrecty; + float image_aspect = viewrectx / viewrecty; float imagex, imagey; if (aspect >= image_aspect) { - imagex = image_aspect/aspect; + imagex = image_aspect / aspect; imagey = 1.0f; } else { - imagex = 1.0f; - imagey = aspect/image_aspect; + imagex = 1.0f; + imagey = aspect / image_aspect; } glTexCoord2f(0.0f, 0.0f); glVertex2f(-imagex, -imagey); glTexCoord2f(0.0f, 1.0f); glVertex2f(-imagex, imagey); glTexCoord2f(1.0f, 1.0f); glVertex2f(imagex, imagey); - glTexCoord2f(1.0f, 0.0f); glVertex2f(imagex, -imagey); + glTexCoord2f(1.0f, 0.0f); glVertex2f(imagex, -imagey); } else { glTexCoord2f(0.0f, 0.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymin); |