diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-02-22 00:28:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-22 00:28:54 +0300 |
| commit | 71ca81019de3a6a34fcf7065eea35623b7a96c10 (patch) | |
| tree | 2112d7f1ef4248d75fce60e30735dd82e9f79918 /source/blender/src/header_view3d.c | |
| parent | 88d840fa925d30ec32a9e1c045409cddbb376c2b (diff) | |
autoThread was inverted at rendertime (forgot to change), added tooltips
Diffstat (limited to 'source/blender/src/header_view3d.c')
| -rw-r--r-- | source/blender/src/header_view3d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index bf173b7b2a1..34169b428cd 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -3139,7 +3139,7 @@ static uiBlock *view3d_edit_meshmenu(void *arg_unused) /* PITA but we should let users know that automerge cant work with multires :/ */ uiDefIconTextBut(block, BUTM, 1, G.scene->automerge ? ICON_CHECKBOX_HLT : ICON_CHECKBOX_DEHLT, - ((Mesh*)G.obedit->data)->mr ? "AutoMerge Editing (multires disables)" : "AutoMerge Editing", + ((Mesh*)G.obedit->data)->mr ? "AutoMerge Editing (disabled by multires)" : "AutoMerge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); |