diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 22 |
2 files changed, 13 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 98473c04704..3a34a31b57e 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -298,7 +298,8 @@ bool BKE_animdata_id_is_animated(const struct ID *id) return true; } - return !BLI_listbase_is_empty(&adt->drivers) || !BLI_listbase_is_empty(&adt->nla_tracks); + return !BLI_listbase_is_empty(&adt->drivers) || !BLI_listbase_is_empty(&adt->nla_tracks) || + !BLI_listbase_is_empty(&adt->overrides); } /* Copying -------------------------------------------- */ diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 6837336b8b8..08890965ece 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3763,26 +3763,26 @@ int BKE_object_is_modified(Scene *scene, Object *ob) * speed. In combination with checks of modifier stack and real life usage * percentage of false-positives shouldn't be that height. */ -static bool object_moves_in_time(Object *object) +bool BKE_object_moves_in_time(const Object *object, bool recurse_parent) { - AnimData *adt = object->adt; - if (adt != NULL) { - /* If object has any sort of animation data assume it is moving. */ - if (adt->action != NULL || !BLI_listbase_is_empty(&adt->nla_tracks) || - !BLI_listbase_is_empty(&adt->drivers) || !BLI_listbase_is_empty(&adt->overrides)) { - return true; - } + /* If object has any sort of animation data assume it is moving. */ + if (BKE_animdata_id_is_animated(&object->id)) { + return true; } if (!BLI_listbase_is_empty(&object->constraints)) { return true; } - if (object->parent != NULL) { - /* TODO(sergey): Do recursive check here? */ - return true; + if (recurse_parent && object->parent != NULL) { + return BKE_object_moves_in_time(object->parent, true); } return false; } +static bool object_moves_in_time(const Object *object) +{ + return BKE_object_moves_in_time(object, true); +} + static bool object_deforms_in_time(Object *object) { if (BKE_key_from_object(object) != NULL) { |