diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-10-28 21:43:55 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-10-28 21:43:55 +0300 |
| commit | 5f3a96be10344fcb59ec22cec6a8a58b068c15ad (patch) | |
| tree | 1431126496c431284653e15525aaa679af1ccb6e /source/blender/src/editarmature.c | |
| parent | f7b513ea7ae8050df833e17e66ace228abce2644 (diff) | |
Fixes after report from Matt:
- errors in names/hotkeys pulldowns fixed
- full window option in pulldown win caused ortho on/off event
- weight paint now shows vertex color Panel in editbuttons
- adding armature while vpaint mode, didnt end vpaint mode
- cleaned up some buttons design
- leftmouse press-hold for toolbox also moved 3d cursor
Diffstat (limited to 'source/blender/src/editarmature.c')
| -rw-r--r-- | source/blender/src/editarmature.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/src/editarmature.c b/source/blender/src/editarmature.c index 21cce203943..1df6d71750c 100644 --- a/source/blender/src/editarmature.c +++ b/source/blender/src/editarmature.c @@ -1500,6 +1500,9 @@ 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_FACESELECT+G_TEXTUREPAINT+G_WEIGHTPAINT); + setcursor_space(SPACE_VIEW3D, CURSOR_STD); + check_editmode(OB_ARMATURE); /* If we're not the "obedit", make a new object and enter editmode */ |