Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix unreported Auto IK crash when using targetless IK.

Browse Source 
Needed to use a temporary pchan iterator to make sure that we keep track
of the selected bone.
This commit is contained in:
Sebastian Parborg
2020-04-15 13:25:44 +02:00
parent 6547d9d3e2
commit 8fcbbcf2e6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/transform/transform_convert_armature.c
View File

@@ -289,7 +289,7 @@ static short pose_grab_with_ik_add(bPoseChannel *pchan)
/* Rule: not if there's already an IK on this channel */ /* Rule: not if there's already an IK on this channel */
for (con = pchan->constraints.first; con; con = con->next) { for (con = pchan->constraints.first; con; con = con->next) {
if (con->type == CONSTRAINT_TYPE_KINEMATIC) { if (con->type == CONSTRAINT_TYPE_KINEMATIC && (con->flag & CONSTRAINT_OFF) == 0) {
data = con->data; data = con->data;
if (data->tar == NULL || (data->tar->type == OB_ARMATURE && data->subtarget[0] == '\0')) { if (data->tar == NULL || (data->tar->type == OB_ARMATURE && data->subtarget[0] == '\0')) {
@@ -304,17 +304,17 @@ static short pose_grab_with_ik_add(bPoseChannel *pchan)
/* if no chain length has been specified, /* if no chain length has been specified,
* just make things obey standard rotation locks too */ * just make things obey standard rotation locks too */
if (data->rootbone == 0) { if (data->rootbone == 0) {
for (; pchan; pchan = pchan->parent) { for (bPoseChannel *pchan_iter = pchan; pchan_iter; pchan_iter = pchan_iter->parent) {
/* here, we set ik-settings for bone from pchan->protectflag */ /* here, we set ik-settings for bone from pchan->protectflag */
// XXX: careful with quats/axis-angle rotations where we're locking 4d components // XXX: careful with quats/axis-angle rotations where we're locking 4d components
if (pchan->protectflag & OB_LOCK_ROTX) { if (pchan_iter->protectflag & OB_LOCK_ROTX) {
pchan->ikflag |= BONE_IK_NO_XDOF_TEMP; pchan_iter->ikflag |= BONE_IK_NO_XDOF_TEMP;
} }
if (pchan->protectflag & OB_LOCK_ROTY) { if (pchan_iter->protectflag & OB_LOCK_ROTY) {
pchan->ikflag |= BONE_IK_NO_YDOF_TEMP; pchan_iter->ikflag |= BONE_IK_NO_YDOF_TEMP;
} }
if (pchan->protectflag & OB_LOCK_ROTZ) { if (pchan_iter->protectflag & OB_LOCK_ROTZ) {
pchan->ikflag |= BONE_IK_NO_ZDOF_TEMP; pchan_iter->ikflag |= BONE_IK_NO_ZDOF_TEMP;
} }
} }
} }