diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-10-14 07:57:15 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-14 07:57:15 +0400 |
commit | b0b8e93f7f3264e690eae68bf15e4239e146485e (patch) | |
tree | 47c1548968201ca395073a8b00bf0bf19c057743 | |
parent | 266811368b620ee6609be8c07a1d0037b244b9b1 (diff) |
bugfix [#24238] "M" (move) selects wrong action when with armature
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 584112ccacd..6d4aa3ebe64 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -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; } |