diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-23 19:05:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-23 19:05:35 +0300 |
| commit | a94e9c5955876e7dc3e1fb6c1aef6568b5b1f1e7 (patch) | |
| tree | 78ec7cdc5df4c0e6cca7d101336d97f36cb2d6b4 /source/blender/editors/space_view3d | |
| parent | 9019d3b1f2ae10e88a0a0f430bdca3b7f2f83fb7 (diff) | |
fix [#26456] weightpaint mode with armature modifier, armature mode
disable bone selection in weightpaint mode when the armature is not in pose mode.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawarmature.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 701e9f8af0d..a69ad1c7050 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -2460,12 +2460,16 @@ int draw_armature(Scene *scene, View3D *v3d, ARegion *ar, Base *base, int dt, in /* 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) { |