Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-05-20 18:54:47 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-05-20 19:00:34 +0300
commite4e31e4f14e7223b348cc0b9db6e2ac05012dd75 (patch)
treeac260d4e797488d00aab9791934df6bc76ca23e2 /source/blender/blenkernel
parent93b5682444d51c3232efa59b0e4e6c3e0562a503 (diff)
Fix T76916: Cycles missing deform motion blur for shape key + subdiv modifier
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index de34b0cba69..849b42ccb2c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3876,6 +3876,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)) {
@@ -4006,6 +4010,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;