[Bf-blender-cvs] [6960c68] compositor-2016: Depsgraph: Fix rest pose still using bone constraints
Sergey Sharybin
noreply at git.blender.org
Wed Jun 8 21:47:51 CEST 2016
Commit: 6960c689cca06fc7549f360b2a088f64de04feb8
Author: Sergey Sharybin
Date: Wed May 18 11:38:52 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB6960c689cca06fc7549f360b2a088f64de04feb8
Depsgraph: Fix rest pose still using bone constraints
===================================================================
M source/blender/blenkernel/intern/armature_update.c
===================================================================
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index 34d9962..826bb12 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -633,7 +633,11 @@ void BKE_pose_constraints_evaluate(EvaluationContext *UNUSED(eval_ctx),
{
Scene *scene = G.main->scene.first;
DEBUG_PRINT("%s on %s pchan %s\n", __func__, ob->id.name, pchan->name);
- if (pchan->flag & POSE_IKTREE || pchan->flag & POSE_IKSPLINE) {
+ bArmature *arm = (bArmature *)ob->data;
+ if (arm->flag & ARM_RESTPOS) {
+ return;
+ }
+ else if (pchan->flag & POSE_IKTREE || pchan->flag & POSE_IKSPLINE) {
/* IK are being solved separately/ */
}
else {
More information about the Bf-blender-cvs
mailing list