archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T60411: crash in multi-object pose mode, with some armatures in rest pose.

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-01-11 12:19:42 +01:00
parent a369004543
commit 854485b4b3
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/transform/transform_conversions.c
View File

@@ -1162,10 +1162,17 @@ static void createTransPose(TransInfo *t)
continue;
}
/* set flags and count total */
tc->data_len = count_set_pose_transflags(ob, t->mode, t->around, has_translate_rotate);
if (tc->data_len == 0) {
continue;
}
if (arm->flag & ARM_RESTPOS) {
if (ELEM(t->mode, TFM_DUMMY, TFM_BONESIZE) == 0) {
BKE_report(t->reports, RPT_ERROR, "Cannot change Pose when 'Rest Position' is enabled");
return;
tc->data_len = 0;
continue;
}
}
@@ -1174,10 +1181,6 @@ static void createTransPose(TransInfo *t)
ik_on = pose_grab_with_ik(bmain, ob);
if (ik_on) t->flag |= T_AUTOIK;
}
/* set flags and count total (warning, can change transform to rotate) */
tc->data_len = count_set_pose_transflags(ob, t->mode, t->around, has_translate_rotate);
/* len may be zero, skip next iteration. */
}
/* if there are no translatable bones, do rotation */