diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2020-05-20 23:56:09 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2020-05-20 23:56:09 +0300 |
commit | 8a0840b0ee9a60a62bf6d1f800d08bf852427fd5 (patch) | |
tree | 80344f42e0483345eef48796380dc7e5f229463b /source/blender/blenkernel/intern/object.c | |
parent | 71fa4601452756f3b4a26b51ec44f13edbf2e9a8 (diff) | |
parent | af3a55bb1b7d11c3036839d66fcf4280f1dae96b (diff) |
Merge branch 'blender-v2.83-release'
# Conflicts:
# source/blender/draw/engines/eevee/eevee_volumes.c
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 6bd841ca8e5..3e4118ee601 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3887,6 +3887,10 @@ bool BKE_object_is_child_recursive(const Object *ob_parent, const Object *ob_chi * cases false positives are hard to avoid (shape keys for example) */ int BKE_object_is_modified(Scene *scene, Object *ob) { + /* Always test on original object since evaluated object may no longer + * have shape keys or modifiers that were used to evaluate it. */ + ob = DEG_get_original_object(ob); + int flag = 0; if (BKE_key_from_object(ob)) { @@ -4017,6 +4021,10 @@ static bool modifiers_has_animation_check(const Object *ob) * and we can still if there was actual deformation afterwards */ int BKE_object_is_deform_modified(Scene *scene, Object *ob) { + /* Always test on original object since evaluated object may no longer + * have shape keys or modifiers that were used to evaluate it. */ + ob = DEG_get_original_object(ob); + ModifierData *md; VirtualModifierData virtualModifierData; int flag = 0; |