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:
authorCampbell Barton <campbell@blender.org>2022-05-11 09:34:28 +0300
committerCampbell Barton <campbell@blender.org>2022-05-11 09:34:28 +0300
commitec53e9fa697f39435480e174345368ee6b980120 (patch)
treeb0842a37f8de19dd9e031124dde22c4311ae027b
parentae683a22c64e8e184e8602a2c1df1adad2dc8e6d (diff)
parent81b797af669d21fc01855f94032faa6c92a4fd9b (diff)
Merge branch 'blender-v3.2-release'
-rw-r--r--intern/cycles/blender/util.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/intern/cycles/blender/util.h b/intern/cycles/blender/util.h
index eead6cec08c..49cecb6d0f3 100644
--- a/intern/cycles/blender/util.h
+++ b/intern/cycles/blender/util.h
@@ -262,8 +262,11 @@ static inline bool BKE_object_is_modified(BL::Object &self, BL::Scene &scene, bo
static inline bool BKE_object_is_deform_modified(BObjectInfo &self, BL::Scene &scene, bool preview)
{
if (!self.is_real_object_data()) {
- return false;
+ /* Comes from geometry nodes, can't use heuristic to guess if it's animated. */
+ return true;
}
+
+ /* Use heuristic to quickly check if object is potentially animated. */
return self.real_object.is_deform_modified(scene, (preview) ? (1 << 0) : (1 << 1)) ? true :
false;
}