[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32461] trunk/blender/source/blender/ editors/screen/screen_ops.c: bugfix [#24238] "M" (move) selects wrong action when with armature

[Campbell Barton]

Revision: 32461
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32461
Author:   campbellbarton
Date:     2010-10-14 05:57:15 +0200 (Thu, 14 Oct 2010)

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

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-10-14 02:05:37 UTC (rev 32460)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-10-14 03:57:15 UTC (rev 32461)
@@ -262,11 +262,16 @@
 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;
 }