[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35731] trunk/blender/source/blender/ editors/space_view3d/drawarmature.c: fix [#26456] weightpaint mode with armature modifier, armature mode

[Campbell Barton]

Revision: 35731
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35731
Author:   campbellbarton
Date:     2011-03-23 16:05:35 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
fix [#26456] weightpaint mode with armature modifier, armature mode
disable bone selection in weightpaint mode when the armature is not in pose mode.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawarmature.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawarmature.c	2011-03-23 15:15:42 UTC (rev 35730)
+++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c	2011-03-23 16:05:35 UTC (rev 35731)
@@ -2460,12 +2460,16 @@
 			/* drawing posemode selection indices or colors only in these cases */
 			if(!(base->flag & OB_FROMDUPLI)) {
 				if(G.f & G_PICKSEL) {
+#if 0				/* nifty but actually confusing to allow bone selection out of posemode */
 					if(OBACT && (OBACT->mode & OB_MODE_WEIGHT_PAINT)) {
 						if(ob==modifiers_isDeformedByArmature(OBACT))
 							arm->flag |= ARM_POSEMODE;
 					}
-					else if(ob->mode & OB_MODE_POSE) 
+					else
+#endif
+					if(ob->mode & OB_MODE_POSE) {
 						arm->flag |= ARM_POSEMODE;
+					}
 				}
 				else if(ob->mode & OB_MODE_POSE) {
 					if (arm->ghosttype == ARM_GHOST_RANGE) {