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

bugfix [#24238] "M" (move) selects wrong action when with armature

Browse Source
This commit is contained in:
Campbell Barton
2010-10-14 03:57:15 +00:00
parent 266811368b
commit b0b8e93f7f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/screen/screen_ops.c
View File

@@ -262,11 +262,16 @@ int ED_operator_editarmature(bContext *C)
int ED_operator_posemode(bContext *C)
{
Object *obact= CTX_data_active_object(C);
Object *obedit= CTX_data_edit_object(C);
if ((obact != obedit) && ED_object_pose_armature(obact))
return 1;
if ((obact != CTX_data_edit_object(C))) {
Object *obpose;
if(obpose= ED_object_pose_armature(obact)) {
if((obact == obpose) || (obact->mode & OB_MODE_WEIGHT_PAINT)) {
return 1;
}
}
}
return 0;
}