griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPv3: Assert on translating keys

Browse Source 
Caused by f011d8f508.
`ale->update` should be 0 after animdata update. Otherwise it would
cause the assert (it also ensures all update cases are handled for keys).

Resolves #122259

Pull Request: https://projects.blender.org/blender/blender/pulls/122435
This commit is contained in:
Pratik Borhade
2024-05-29 14:24:37 +02:00
committed by Pratik Borhade
parent 022620b490
commit c7635fa200
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/animation/anim_deps.cc
View File

@@ -362,7 +362,14 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
ANIMTYPE_ANIMDATA,
ANIMTYPE_NLAACTION,
ANIMTYPE_NLATRACK,
ANIMTYPE_NLACURVE,
ANIMTYPE_NLACURVE))
{
if (ale->update & ANIM_UPDATE_DEPS) {
ale->update &= ~ANIM_UPDATE_DEPS;
ANIM_list_elem_update(ac->bmain, ac->scene, ale);
}
}
else if (ELEM(ale->type,
ANIMTYPE_GREASE_PENCIL_LAYER,
ANIMTYPE_GREASE_PENCIL_LAYER_GROUP,
ANIMTYPE_GREASE_PENCIL_DATABLOCK))
@@ -371,6 +378,9 @@ void ANIM_animdata_update(bAnimContext *ac, ListBase *anim_data)
ale->update &= ~ANIM_UPDATE_DEPS;
ANIM_list_elem_update(ac->bmain, ac->scene, ale);
}
/* Order appears to be already handled in `grease_pencil_layer_apply_trans_data` when
* translating. */
ale->update &= ~(ANIM_UPDATE_HANDLES | ANIM_UPDATE_ORDER);
}
else if (ale->update) {
#if 0