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:
authorMatt Ebb <matt@mke3.net>2006-06-22 11:06:42 +0400
committerMatt Ebb <matt@mke3.net>2006-06-22 11:06:42 +0400
commit973ffe5319ec0e5c19933ac509835a1ddfdabe9d (patch)
treec69ede2fc27b8d0d1d720a2d159b284dda9b07f7 /source/blender/src/drawseq.c
parent193015653f5210d3ca7e10326fade2fb9fd465af (diff)
* Two sequence editor fixes, found by Peter
- strip handle selection now properly uses the new clamped handle size, instead of the old triangles - fixed an issue where a strip resized inwards would disappear when the original start < window edge < resized start, and vice versa
Diffstat (limited to 'source/blender/src/drawseq.c')
-rw-r--r--source/blender/src/drawseq.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c
index 119d9838df5..08a9f196012 100644
--- a/source/blender/src/drawseq.c
+++ b/source/blender/src/drawseq.c
@@ -1262,8 +1262,8 @@ void drawseqspace(ScrArea *sa, void *spacedata)
seq= ed->seqbasep->first;
while(seq) { /* bound box test, dont draw outside the view */
if (seq->flag & SELECT ||
- seq->startdisp > v2d->cur.xmax ||
- seq->enddisp < v2d->cur.xmin ||
+ MIN2(seq->startdisp, seq->start) > v2d->cur.xmax ||
+ MAX2(seq->enddisp, seq->start+seq->len) < v2d->cur.xmin ||
seq->machine+1.0 < v2d->cur.ymin ||
seq->machine > v2d->cur.ymax)
{
@@ -1279,8 +1279,8 @@ void drawseqspace(ScrArea *sa, void *spacedata)
seq= ed->seqbasep->first;
while(seq) { /* bound box test, dont draw outside the view */
if (!(seq->flag & SELECT) ||
- seq->startdisp > v2d->cur.xmax ||
- seq->enddisp < v2d->cur.xmin ||
+ MIN2(seq->startdisp, seq->start) > v2d->cur.xmax ||
+ MAX2(seq->enddisp, seq->start+seq->len) < v2d->cur.xmin ||
seq->machine+1.0 < v2d->cur.ymin ||
seq->machine > v2d->cur.ymax)
{