diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-02-16 01:13:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-16 01:13:44 +0300 |
| commit | 1597ba07705fbe39c219f1f99b5c92e9b06b8f0c (patch) | |
| tree | 88afce9b15129ea0b800fcd832b66fb57b7178b0 /source/blender/src/header_view3d.c | |
| parent | a4b05a18d96ea49faed6bac97060767b5d910b26 (diff) | |
automerge and multires cant coexist, added note in the menu to say this and stopped automerge from running and popping up an annoying error when multires is enabled.
Diffstat (limited to 'source/blender/src/header_view3d.c')
| -rw-r--r-- | source/blender/src/header_view3d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 0a394d68d7a..5feeafd0481 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -3136,11 +3136,11 @@ static uiBlock *view3d_edit_meshmenu(void *arg_unused) uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); - if(G.scene->automerge) { - uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "AutoMerge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); - } else { - uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "AutoMerge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); - } + /* 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", + 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, ""); |