diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-09 11:31:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-09 11:31:15 +0400 |
| commit | aa6d7ebd145ff375a9dc876d33065f80d94accca (patch) | |
| tree | 4c9562c2575294c94bd55cb4b3bd25a9e7e793b6 /source/blender/editors/space_view3d/view3d_header.c | |
| parent | 9d0186fc6a5aa0aab36b9a1f52e3cd5e1ac46767 (diff) | |
| parent | 8714fb7019e853703ce8b102edac43d84b7bbe14 (diff) | |
svn merge ^/trunk/blender -r40720:40872
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_header.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index b0a77843421..d223896924d 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -530,7 +530,12 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) row= uiLayoutRow(layout, 1); uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); - uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + + /* pose/object only however we want to allow in weight paint mode too + * so dont be totally strict and just check not-editmode for now */ + if (obedit == NULL) { + uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + } /* Transform widget / manipulators */ row= uiLayoutRow(layout, 1); |