[Bf-blender-cvs] [02e3bf22ab6] master: Depsgraph: detect bbone_segments drivers from Object animation data.
Alexander Gavrilov
noreply at git.blender.org
Tue May 14 11:41:24 CEST 2019
Commit: 02e3bf22ab6059db03c856f1d34b27a24ef8ec31
Author: Alexander Gavrilov
Date: Tue May 14 12:09:02 2019 +0300
Branches: master
https://developer.blender.org/rB02e3bf22ab6059db03c856f1d34b27a24ef8ec31
Depsgraph: detect bbone_segments drivers from Object animation data.
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 71f482e8630..36c6d246097 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -114,7 +114,10 @@ bool DepsgraphBuilder::check_pchan_has_bbone(Object *object, const bPoseChannel
}
bArmature *armature = static_cast<bArmature *>(object->data);
AnimatedPropertyID property_id(&armature->id, &RNA_Bone, pchan->bone, "bbone_segments");
- return cache_->isPropertyAnimated(&armature->id, property_id);
+ /* Check both Object and Armature animation data, because drivers modifying Armature
+ * state could easily be created in the Object AnimData. */
+ return cache_->isPropertyAnimated(&object->id, property_id) ||
+ cache_->isPropertyAnimated(&armature->id, property_id);
}
bool DepsgraphBuilder::check_pchan_has_bbone_segments(Object *object, const bPoseChannel *pchan)
More information about the Bf-blender-cvs
mailing list