archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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.

Browse Source
This commit is contained in:
Campbell Barton
2008-02-15 22:13:44 +00:00
parent a4b05a18d9
commit 1597ba0770
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/editmesh_mods.c
View File

@@ -134,14 +134,15 @@ void EM_select_mirrored(void)
void EM_automerge(int update) {
int len;
if (G.scene->automerge) {
if (G.obedit && G.obedit->type==OB_MESH) {
len = removedoublesflag(1, 1, G.scene->toolsettings->doublimit);
if (len) {
G.totvert -= len; /* saves doing a countall */
if (update) {
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
}
if ((G.scene->automerge) &&
(G.obedit && G.obedit->type==OB_MESH) &&
(((Mesh*)G.obedit->data)->mr==NULL)
) {
len = removedoublesflag(1, 1, G.scene->toolsettings->doublimit);
if (len) {
G.totvert -= len; /* saves doing a countall */
if (update) {
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
}
}
}

10
source/blender/src/header_view3d.c
View File

@@ -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, "");