[Bf-blender-cvs] [0721fbb6e1e] master: Fix for failing constraints test
Philipp Oeser
noreply at git.blender.org
Wed Sep 9 22:12:37 CEST 2020
Commit: 0721fbb6e1e28bb7afd33f3c4d00c0fd53e292cb
Author: Philipp Oeser
Date: Wed Sep 9 22:05:58 2020 +0200
Branches: master
https://developer.blender.org/rB0721fbb6e1e28bb7afd33f3c4d00c0fd53e292cb
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 2f9917a2674..8b10a865a68 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