griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for own error in recent commit with active pose mode, depended on an uninitialized flag.

Browse Source
This commit is contained in:
Campbell Barton
2012-12-18 07:38:02 +00:00
parent a82397561e
commit 2c0bceb1f5
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/transform/transform_manipulator.c
View File

@@ -148,10 +148,8 @@ static void stats_pose(Scene *scene, RegionView3D *rv3d, bPoseChannel *pchan)
Bone *bone = pchan->bone;
if (bone) {
if (bone->flag & BONE_TRANSFORM) {
calc_tw_center(scene, pchan->pose_head);
protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
}
calc_tw_center(scene, pchan->pose_head);
protectflag_to_drawflags(pchan->protectflag, &rv3d->twdrawflag);
}
}
@@ -503,9 +501,12 @@ int calc_manipulator_stats(const bContext *C)
if ((v3d->around == V3D_ACTIVE) && (pchan = BKE_pose_channel_active(ob))) {
/* doesn't check selection or visibility intentionally */
stats_pose(scene, rv3d, pchan);
totsel = 1;
ok = TRUE;
Bone *bone = pchan->bone;
if (bone) {
stats_pose(scene, rv3d, pchan);
totsel = 1;
ok = TRUE;
}
}
else {
totsel = count_set_pose_transflags(&mode, 0, ob);
@@ -513,7 +514,10 @@ int calc_manipulator_stats(const bContext *C)
if (totsel) {
/* use channels to get stats */
for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
stats_pose(scene, rv3d, pchan);
Bone *bone = pchan->bone;
if (bone && (bone->flag & BONE_TRANSFORM)) {
stats_pose(scene, rv3d, pchan);
}
}
ok = TRUE;
}