Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-10-14 12:23:17 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-10-14 12:23:17 +0300
commitad583101617cbe9e6476b2870a69084240c309d3 (patch)
tree86ba901daca3da5f7bf0128e886b16f5843022ec /source/blender/editors/space_sequencer
parent6562e4ebe9ddf8e3d08a394fd52f5d6adce0b8fd (diff)
Comment cleanup, use better lower bound for waveform
Diffstat (limited to 'source/blender/editors/space_sequencer')
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 642c55df13f..2ae7cdd4f98 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -248,7 +248,7 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc
value1 = waveform->data[pos * 3];
value2 = waveform->data[pos * 3 + 1];
- if (samplestep >= 2.0f) {
+ if (samplestep > 1.0f) {
for (j = pos + 1; (j < waveform->length) && (j < pos + samplestep); j++) {
if (value1 > waveform->data[j * 3])
value1 = waveform->data[j * 3];
@@ -258,12 +258,12 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq, Scene *scene, Sequenc
}
}
else {
+ /* use simple linear interpolation */
float f = sampleoffset - pos;
value1 = (1.0f - f) * value1 + f * waveform->data[pos * 3 + 3];
value2 = (1.0f - f) * value2 + f * waveform->data[pos * 3 + 4];
}
- /* max(value, -1) ensures that no sound gets drawn as a line */
glVertex2f(x1 + i * stepsize, ymid + value1 * yscale);
glVertex2f(x1 + i * stepsize, ymid + value2 * yscale);
}