blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T57656: Keyframes cannot be selected in Grease Pencil Dopesheet. 

Partial revert of rBf250f9256e065: GP and masks use integer
frames, so float code isn't working or even needed.
This commit is contained in:
Alexander Gavrilov 2018-11-06 22:31:57 +03:00
parent ad248333a6
commit 5c18393c8e
Notes: blender-bot 2023-02-14 05:04:52 +01:00 
Referenced by issue #57656, Sometime Keyframes cannot be selected in Grease Pencil Dopesheet
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,9 +245,15 @@ 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;
return compare_ak_cfraPtr(node, &gpf->framenum);
if (gpf->framenum < ak->cfra)
return -1;
else if (gpf->framenum > ak->cfra)
return 1;
else
return 0;
}
/* New node callback used for building ActKeyColumns from GPencil frames */
@ -289,9 +295,15 @@ 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;
return compare_ak_cfraPtr(node, &masklay_shape->frame);
if (masklay_shape->frame < ak->cfra)
return -1;
else if (masklay_shape->frame > ak->cfra)
return 1;
else
return 0;
}
/* New node callback used for building ActKeyColumns from GPencil frames */