From a018a7fb0d5b2cd6de2bb7b4f4aa092594655fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 26 Nov 2019 15:13:52 +0100 Subject: Removed `BKE_object_is_animated()` The function isn't used anywhere, and it's deceptively returning false negatives. For example, `modifier_dependsOnTime()` will return `false` for hook modifiers, even when the hook target is animated. Querying the depsgraph for dependency on the time source would be a better approach. --- source/blender/blenkernel/BKE_object.h | 1 - source/blender/blenkernel/intern/object.c | 17 +---------------- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index d76c55f0815..2f36e13d4c8 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -345,7 +345,6 @@ bool BKE_object_shapekey_free(struct Main *bmain, struct Object *ob); bool BKE_object_flag_test_recursive(const struct Object *ob, short flag); bool BKE_object_is_child_recursive(const struct Object *ob_parent, const struct Object *ob_child); -bool BKE_object_is_animated(struct Scene *scene, struct Object *ob); /* return ModifierMode flag */ int BKE_object_is_modified(struct Scene *scene, struct Object *ob); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 2f7bd27445a..6837336b8b8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3826,7 +3826,7 @@ static bool constructive_modifier_is_deform_modified(ModifierData *md) return false; } -static bool modifiers_has_animation_check(Object *ob) +static bool modifiers_has_animation_check(const Object *ob) { /* TODO(sergey): This is a bit code duplication with depsgraph, but * would be nicer to solve this as a part of new dependency graph @@ -3898,21 +3898,6 @@ int BKE_object_is_deform_modified(Scene *scene, Object *ob) return flag; } -/* See if an object is using an animated modifier */ -bool BKE_object_is_animated(Scene *scene, Object *ob) -{ - ModifierData *md; - VirtualModifierData virtualModifierData; - - for (md = modifiers_getVirtualModifierList(ob, &virtualModifierData); md; md = md->next) { - if (modifier_dependsOnTime(md) && (modifier_isEnabled(scene, md, eModifierMode_Realtime) || - modifier_isEnabled(scene, md, eModifierMode_Render))) { - return true; - } - } - return false; -} - /** Return the number of scenes using (instantiating) that object in their collections. */ int BKE_object_scenes_users_get(Main *bmain, Object *ob) { -- cgit v1.2.3