diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-22 20:09:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-22 20:09:27 +0400 |
| commit | 7126a4699e3b85f47cd2cc84bdb6a511e9a17f69 (patch) | |
| tree | 74af0d993321a75c5a3fb61e6fbeca2011784b24 /source/blender/editors/space_view3d/view3d_header.c | |
| parent | 52a131b6006e131b02225040d0c9e48f5fd8efac (diff) | |
| parent | 535668eef01b29b18b71022d1d8f04962251e34c (diff) | |
svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_header.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index e4c316a91f2..4ac5dc2e70c 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -501,7 +501,15 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C) PointerRNA meshptr; RNA_pointer_create(&ob->id, &RNA_Mesh, ob->data, &meshptr); - uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + if(ob->mode & (OB_MODE_TEXTURE_PAINT|OB_MODE_VERTEX_PAINT)) { + uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + } + else { + + row= uiLayoutRow(layout, 1); + uiItemR(row, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + uiItemR(row, &meshptr, "use_paint_mask_vertex", UI_ITEM_R_ICON_ONLY, "", ICON_NONE); + } } else { const char *str_menu; |