From b0b8e93f7f3264e690eae68bf15e4239e146485e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 14 Oct 2010 03:57:15 +0000 Subject: bugfix [#24238] "M" (move) selects wrong action when with armature --- source/blender/editors/screen/screen_ops.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source') 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; } -- cgit v1.2.3