[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13710] trunk/blender/source/blender/src: 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 .
Campbell Barton
ideasman42 at gmail.com
Fri Feb 15 23:13:46 CET 2008
Revision: 13710
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13710
Author: campbellbarton
Date: 2008-02-15 23:13:44 +0100 (Fri, 15 Feb 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/src/editmesh_mods.c
trunk/blender/source/blender/src/header_view3d.c
Modified: trunk/blender/source/blender/src/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_mods.c 2008-02-15 18:50:13 UTC (rev 13709)
+++ trunk/blender/source/blender/src/editmesh_mods.c 2008-02-15 22:13:44 UTC (rev 13710)
@@ -134,14 +134,15 @@
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);
}
}
}
Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c 2008-02-15 18:50:13 UTC (rev 13709)
+++ trunk/blender/source/blender/src/header_view3d.c 2008-02-15 22:13:44 UTC (rev 13710)
@@ -3136,11 +3136,11 @@
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, "");
More information about the Bf-blender-cvs
mailing list