[Bf-blender-cvs] [9f473e22751] blender-v2.90-release: Fix for failing constraints test
Philipp Oeser
noreply at git.blender.org
Mon Sep 21 09:50:33 CEST 2020
Commit: 9f473e2275197539e43753b8f5966644857481a6
Author: Philipp Oeser
Date: Wed Sep 9 22:05:58 2020 +0200
Branches: blender-v2.90-release
https://developer.blender.org/rB9f473e2275197539e43753b8f5966644857481a6
Fix for failing constraints test
Caused by own rB6dc7266cf1f4.
When overriding context for constraint operators (such as in constraint
tests), it could happen that context "active_pose_bone" is set, but
"pose_bone" isnt. Now check for both in ED_object_pose_constraint_list.
===================================================================
M source/blender/editors/object/object_constraint.c
===================================================================
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index b6ff599da9a..cdb7a9f2b83 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -107,9 +107,12 @@ ListBase *ED_object_constraint_active_list(Object *ob)
* ED_object_constraint_active_list, such constraints are not excluded here). */
ListBase *ED_object_pose_constraint_list(const bContext *C)
{
- bPoseChannel *pose_bone = CTX_data_pointer_get(C, "pose_bone").data;
+ bPoseChannel *pose_bone = CTX_data_pointer_get(C, "active_pose_bone").data;
if (pose_bone == NULL) {
- return NULL;
+ pose_bone = CTX_data_pointer_get(C, "pose_bone").data;
+ if (pose_bone == NULL) {
+ return NULL;
+ }
}
return &pose_bone->constraints;
More information about the Bf-blender-cvs
mailing list