archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

AnimSys2: Fix crash in Dopesheet, as I overlooked a few cases in previous commit.

Browse Source
This commit is contained in:
Joshua Leung
2008-12-08 11:19:44 +00:00
parent 73d4bd5ff8
commit b9f2a2a42a
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/src/drawaction.c
View File

@@ -1217,16 +1217,19 @@ static ActKeysInc *init_aki_data(void *data, short datatype, bActListElem *ale)
aki.ads= NULL;
aki.actmode= datatype;
/* set start/end frames to use for time-based keyframe culling hacks... */
// FIXME: this needs to be a bit better defined...
aki.start= G.v2d->cur.xmin - 10;
aki.end= G.v2d->cur.xmax + 10;
if (G.saction->flag & SACTION_HORIZOPTIMISEON) {
// FIXME: this needs to be a bit better defined...
aki.start= G.v2d->cur.xmin - 10;
aki.end= G.v2d->cur.xmax + 10;
}
else {
aki.start= aki.end= 0;
}
/* only return pointer to this data if the culling option is turned on */
if (G.saction->flag & SACTION_HORIZOPTIMISEON)
return &aki;
else
return NULL;
/* always return pointer... */
return &aki;
}
static void draw_channel_strips(void)
@@ -2157,6 +2160,10 @@ static short bezt_in_aki_range (ActKeysInc *aki, BezTriple *bezt)
if (aki == NULL)
return 1;
/* if start and end are both 0, then don't care about range */
if (IS_EQ(aki->start, 0) && IS_EQ(aki->end, 0))
return 1;
/* if nla-scaling is in effect, apply appropriate scaling adjustments */
if (aki->ob) {
float frame= get_action_frame_inv(aki->ob, bezt->vec[1][0]);