blender
/
blender
130
397
Fork 571
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Dopesheet: correctly use floating point threshold in ActKeyColumn tree. 

After some thinking, since the tree itself does always use floating
point numbers, it is better to use the threshold - but correctly.
This commit is contained in:
Alexander Gavrilov 2018-11-07 10:34:50 +03:00
parent 03e5ba3183
commit 469005f1f6
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/animation/keyframes_draw.c
View File

@ -245,15 +245,10 @@ static void nupdate_ak_bezt(void *node, void *data)
/* Comparator callback used for ActKeyColumns and GPencil frame */
static short compare_ak_gpframe(void *node, void *data)
{
ActKeyColumn *ak = (ActKeyColumn *)node;
bGPDframe *gpf = (bGPDframe *)data;
if (gpf->framenum < ak->cfra)
return -1;
else if (gpf->framenum > ak->cfra)
return 1;
else
return 0;
float frame = gpf->framenum;
return compare_ak_cfraPtr(node, &frame);
}
/* New node callback used for building ActKeyColumns from GPencil frames */
@ -295,15 +290,10 @@ static void nupdate_ak_gpframe(void *node, void *data)
/* Comparator callback used for ActKeyColumns and GPencil frame */
static short compare_ak_masklayshape(void *node, void *data)
{
ActKeyColumn *ak = (ActKeyColumn *)node;
MaskLayerShape *masklay_shape = (MaskLayerShape *)data;
if (masklay_shape->frame < ak->cfra)
return -1;
else if (masklay_shape->frame > ak->cfra)
return 1;
else
return 0;
float frame = masklay_shape->frame;
return compare_ak_cfraPtr(node, &frame);
}
/* New node callback used for building ActKeyColumns from GPencil frames */