diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-14 12:19:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-07-14 12:21:04 +0300 |
| commit | 82740cd282636fe318c3e4c7c3b1c2033857350d (patch) | |
| tree | 6e904ad999a48b4ab3c1428641a482d7955cce57 /source/blender/depsgraph | |
| parent | 9c80e52a89ca1d514c57700e4916ee890c53c4c7 (diff) | |
Fix T45423: depsgraph: crash in IDDepsNode::tag_update
Two issues fixed in this commit:
- Clearing or adding animation via python should ensure relations are valid.
- Animation component animation data might be null caused by removing animation
from python.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsnode.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/depsnode.cc b/source/blender/depsgraph/intern/depsnode.cc index 1736aadf999..7d4d6890c83 100644 --- a/source/blender/depsgraph/intern/depsnode.cc +++ b/source/blender/depsgraph/intern/depsnode.cc @@ -250,8 +250,8 @@ void IDDepsNode::tag_update(Depsgraph *graph) bool do_component_tag = comp_node->type != DEPSNODE_TYPE_ANIMATION; if (comp_node->type == DEPSNODE_TYPE_ANIMATION) { AnimData *adt = BKE_animdata_from_id(id); - BLI_assert(adt != NULL); - if (adt->recalc & ADT_RECALC_ANIM) { + /* Animation data might be null if relations are tagged for update. */ + if (adt != NULL && (adt->recalc & ADT_RECALC_ANIM)) { do_component_tag = true; } } |