diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-04-15 13:20:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-04-15 13:20:13 +0400 |
commit | 2147e74bc5974424f17abbd52d57f0f6a6d0861a (patch) | |
tree | ff64d518964ff612d07ec5276644d25caacf45d8 /source/blender/src/editarmature.c | |
parent | 6bb327badc63d65afe459e092059bf1d9c20b075 (diff) |
made sculpt axis locking use local/global space (using the transform space)
also added some checks for sculpt mixing with other modes (was possible to mix sculpt+posemode)
Diffstat (limited to 'source/blender/src/editarmature.c')
-rw-r--r-- | source/blender/src/editarmature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index 811ea53396b..b074d29dd8d 100644 --- a/source/blender/src/editarmature.c +++ b/source/blender/src/editarmature.c @@ -1855,7 +1855,7 @@ void add_primitiveArmature(int type) if ELEM(curarea->spacetype, SPACE_VIEW3D, SPACE_INFO); else return; if (G.vd==NULL) return; - G.f &= ~(G_VERTEXPAINT+G_TEXTUREPAINT+G_WEIGHTPAINT); + G.f &= ~(G_VERTEXPAINT+G_TEXTUREPAINT+G_WEIGHTPAINT+G_SCULPTMODE); setcursor_space(SPACE_VIEW3D, CURSOR_STD); check_editmode(OB_ARMATURE); |