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

Mesh edit option 'AutoMerge' - access from the mesh menu, basically runs remove doubles after transform. but only merges

Browse Source 
unselected verts into selected verts, so it wont merge verts your not editing.
This commit is contained in:
Campbell Barton
2007-10-18 21:47:55 +00:00
parent 87b9283e1d
commit 5ea45a1385
11 changed files with 122 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/include/BIF_editmesh.h
View File

@@ -206,7 +206,7 @@ extern short sharesFace(struct EditEdge* e1, struct EditEdge* e2);
#define SUBDIV_SELECT_LOOPCUT 3 #define SUBDIV_SELECT_LOOPCUT 3
extern void convert_to_triface(int direction); extern void convert_to_triface(int direction);
extern int removedoublesflag(short flag, float limit); extern int removedoublesflag(short flag, short automerge, float limit);
extern void xsortvert_flag(int flag); extern void xsortvert_flag(int flag);
extern void hashvert_flag(int flag); extern void hashvert_flag(int flag);

1
source/blender/include/editmesh.h
View File

@@ -90,6 +90,7 @@ extern int convex(float *v1, float *v2, float *v3, float *v4);
/* ******************* editmesh_mods.c */ /* ******************* editmesh_mods.c */
extern EditEdge *findnearestedge(int *dist); extern EditEdge *findnearestedge(int *dist);
extern void EM_automerge(int update);
/** /**
* findnearestvert * findnearestvert

2
source/blender/makesdna/DNA_scene_types.h
View File

@@ -418,8 +418,10 @@ typedef struct Scene {
float editbutsize; /* size of normals */ float editbutsize; /* size of normals */
short selectmode; short selectmode;
short proportional, prop_mode; short proportional, prop_mode;
short automerge, pad5, pad6, pad7;
short use_nodes; short use_nodes;
struct bNodeTree *nodetree; struct bNodeTree *nodetree;
void *ed; /* sequence editor data is allocated here */ void *ed; /* sequence editor data is allocated here */

4
source/blender/python/api2_2x/Mesh.c
View File

@@ -3526,7 +3526,7 @@ static PyObject *MEdgeSeq_collapse( BPy_MEdgeSeq * self, PyObject *args )
basact = BASACT; basact = BASACT;
BASACT = base; BASACT = base;
removedoublesflag( 1, 0.0 ); removedoublesflag( 1, 0, 0.0 );
/* make mesh's object active, enter mesh edit mode */ /* make mesh's object active, enter mesh edit mode */
G.obedit = object; G.obedit = object;
@@ -7214,7 +7214,7 @@ static PyObject *Mesh_Tools( BPy_Mesh * self, int type, void **args )
esubdivideflag( 1, 0.0, *((int *)args[0]), 1, 0 ); esubdivideflag( 1, 0.0, *((int *)args[0]), 1, 0 );
break; break;
case MESH_TOOL_REMDOUB: case MESH_TOOL_REMDOUB:
result = removedoublesflag( 1, *((float *)args[0]) ); result = removedoublesflag( 1, 0, *((float *)args[0]) );
attr = PyInt_FromLong( result ); attr = PyInt_FromLong( result );
if( !attr ) if( !attr )

2
source/blender/src/buttons_editing.c
View File

@@ -4226,7 +4226,7 @@ void do_meshbuts(unsigned short event)
G.f -= G_DISABLE_OK; G.f -= G_DISABLE_OK;
break; break;
case B_REMDOUB: case B_REMDOUB:
count= removedoublesflag(1, G.scene->toolsettings->doublimit); count= removedoublesflag(1, 1, G.scene->toolsettings->doublimit);
notice("Removed: %d", count); notice("Removed: %d", count);
if (count) { /* only undo and redraw if an action is taken */ if (count) { /* only undo and redraw if an action is taken */
countall (); countall ();

2
source/blender/src/editmesh_add.c
View File

@@ -960,7 +960,7 @@ void make_prim(int type, float imat[3][3], int tot, int seg,
rotateflag(2, v1->co, cmat); rotateflag(2, v1->co, cmat);
} }
removedoublesflag(4, 0.0001); removedoublesflag(4, 0, 0.0001);
/* and now do imat */ /* and now do imat */
eve= em->verts.first; eve= em->verts.first;

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

@@ -131,6 +131,18 @@ void EM_select_mirrored(void)
} }
} }
void EM_automerge(int update) {
if (G.scene->automerge) {
if (G.obedit && G.obedit->type==OB_MESH) {
if (removedoublesflag(1, 1, G.scene->toolsettings->doublimit)) {
if (update) {
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
}
}
}
}
}
/* ****************************** SELECTION ROUTINES **************** */ /* ****************************** SELECTION ROUTINES **************** */
unsigned int em_solidoffs=0, em_wireoffs=0, em_vertoffs=0; /* set in drawobject.c ... for colorindices */ unsigned int em_solidoffs=0, em_wireoffs=0, em_vertoffs=0; /* set in drawobject.c ... for colorindices */
@@ -3331,7 +3343,7 @@ void Vertex_Menu() {
switch(ret) switch(ret)
{ {
case 1: case 1:
notice("Removed %d Vertices", removedoublesflag(1, G.scene->toolsettings->doublimit)); notice("Removed %d Vertices", removedoublesflag(1, 0, G.scene->toolsettings->doublimit));
BIF_undo_push("Remove Doubles"); BIF_undo_push("Remove Doubles");
break; break;
case 2: case 2:

90
source/blender/src/editmesh_tools.c
View File

@@ -195,8 +195,15 @@ void convert_to_triface(int direction)
} }
int removedoublesflag(short flag, float limit) /* return amount */ int removedoublesflag(short flag, short automerge, float limit) /* return amount */
{ {
/*
flag - Test with vert->flags
weld - Alternative operation, merge unselected into selected.
Used for "Auto Weld" mode. warning.
limit - Quick manhattan distance between verts.
*/
EditMesh *em = G.editMesh; EditMesh *em = G.editMesh;
/* all verts with (flag & 'flag') are being evaluated */ /* all verts with (flag & 'flag') are being evaluated */
EditVert *eve, *v1, *nextve; EditVert *eve, *v1, *nextve;
@@ -209,12 +216,15 @@ int removedoublesflag(short flag, float limit) /* return amount */
if(multires_test()) return 0; if(multires_test()) return 0;
/* flag 128 is cleared, count */ /* flag 128 is cleared, count */
/* Normal non weld operation */
eve= em->verts.first; eve= em->verts.first;
amount= 0; amount= 0;
while(eve) { while(eve) {
eve->f &= ~128; eve->f &= ~128;
if(eve->h==0 && (eve->f & flag)) amount++; if(eve->h==0 && (automerge || (eve->f & flag))) amount++;
eve= eve->next; eve= eve->next;
} }
if(amount==0) return 0; if(amount==0) return 0;
@@ -223,7 +233,7 @@ int removedoublesflag(short flag, float limit) /* return amount */
sb= sortblock= MEM_mallocN(sizeof(xvertsort)*amount,"sortremovedoub"); sb= sortblock= MEM_mallocN(sizeof(xvertsort)*amount,"sortremovedoub");
eve= em->verts.first; eve= em->verts.first;
while(eve) { while(eve) {
if(eve->h==0 && (eve->f & flag)) { if(eve->h==0 && (automerge || (eve->f & flag))) {
sb->x= eve->co[0]+eve->co[1]+eve->co[2]; sb->x= eve->co[0]+eve->co[1]+eve->co[2];
sb->v1= eve; sb->v1= eve;
sb++; sb++;
@@ -232,40 +242,68 @@ int removedoublesflag(short flag, float limit) /* return amount */
} }
qsort(sortblock, amount, sizeof(xvertsort), vergxco); qsort(sortblock, amount, sizeof(xvertsort), vergxco);
/* test for doubles */ /* test for doubles */
sb= sortblock; sb= sortblock;
for(a=0; a<amount; a++) { if (automerge) {
for(a=0; a<amount; a++, sb++) {
eve= sb->v1; eve= sb->v1;
if( (eve->f & 128)==0 ) { if( (eve->f & 128)==0 ) {
sb1= sb+1; sb1= sb+1;
for(b=a+1; b<amount; b++) { for(b=a+1; b<amount && (eve->f & 128)==0; b++, sb1++) {
/* first test: simpel dist */ if(sb1->x - sb->x > limit) break;
dist= sb1->x - sb->x;
if(dist > limit) break;
/* second test: is vertex allowed */ /* when welding, only allow selected-> unselected*/
v1= sb1->v1; v1= sb1->v1;
if( (v1->f & 128)==0 ) { if( (v1->f & 128)==0 ) {
if ((eve->f & flag)==0 && (v1->f & flag)==1) {
dist= (float)fabs(v1->co[0]-eve->co[0]); if( (float)fabs(v1->co[0]-eve->co[0])<=limit &&
if(dist<=limit) { (float)fabs(v1->co[1]-eve->co[1])<=limit &&
dist= (float)fabs(v1->co[1]-eve->co[1]); (float)fabs(v1->co[2]-eve->co[2])<=limit)
if(dist<=limit) { { /* unique bit */
dist= (float)fabs(v1->co[2]-eve->co[2]); eve->f|= 128;
if(dist<=limit) { eve->tmp.v = v1;
}
} else if( (eve->f & flag)==1 && (v1->f & flag)==0 ) {
if( (float)fabs(v1->co[0]-eve->co[0])<=limit &&
(float)fabs(v1->co[1]-eve->co[1])<=limit &&
(float)fabs(v1->co[2]-eve->co[2])<=limit)
{ /* unique bit */
v1->f|= 128; v1->f|= 128;
v1->tmp.v = eve; v1->tmp.v = eve;
} }
} }
} }
} }
sb1++;
} }
} }
sb++; } else {
for(a=0; a<amount; a++, sb++) {
eve= sb->v1;
if( (eve->f & 128)==0 ) {
sb1= sb+1;
for(b=a+1; b<amount; b++, sb1++) {
/* first test: simpel dist */
if(sb1->x - sb->x > limit) break;
v1= sb1->v1;
/* second test: is vertex allowed */
if( (v1->f & 128)==0 ) {
if( (float)fabs(v1->co[0]-eve->co[0])<=limit &&
(float)fabs(v1->co[1]-eve->co[1])<=limit &&
(float)fabs(v1->co[2]-eve->co[2])<=limit)
{
v1->f|= 128;
v1->tmp.v = eve;
}
}
}
}
}
} }
MEM_freeN(sortblock); MEM_freeN(sortblock);
if (!automerge)
for(eve = em->verts.first; eve; eve=eve->next) for(eve = em->verts.first; eve; eve=eve->next)
if((eve->f & flag) && (eve->f & 128)) if((eve->f & flag) && (eve->f & 128))
EM_data_interp_from_verts(eve, eve->tmp.v, eve->tmp.v, 0.5f); EM_data_interp_from_verts(eve, eve->tmp.v, eve->tmp.v, 0.5f);
@@ -445,7 +483,7 @@ int removedoublesflag(short flag, float limit) /* return amount */
eve= (struct EditVert *)em->verts.first; eve= (struct EditVert *)em->verts.first;
while(eve) { while(eve) {
nextve= eve->next; nextve= eve->next;
if(eve->f & flag) { if(automerge || eve->f & flag) {
if(eve->f & 128) { if(eve->f & 128) {
a++; a++;
BLI_remlink(&em->verts, eve); BLI_remlink(&em->verts, eve);
@@ -4023,7 +4061,7 @@ static void bevel_mesh(float bsize, int allfaces)
waitcursor(1); waitcursor(1);
removedoublesflag(1, limit); removedoublesflag(1, 0, limit);
/* tag all original faces */ /* tag all original faces */
efa= em->faces.first; efa= em->faces.first;
@@ -4378,7 +4416,7 @@ static void bevel_mesh(float bsize, int allfaces)
allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWVIEW3D, 0);
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
removedoublesflag(1, limit); removedoublesflag(1, 0, limit);
/* flush selected vertices to edges/faces */ /* flush selected vertices to edges/faces */
EM_select_flush(); EM_select_flush();
@@ -4531,7 +4569,7 @@ int EdgeLoopDelete(void) {
return 0; return 0;
} }
select_more(); select_more();
removedoublesflag(1,0.001); removedoublesflag(1,0, 0.001);
EM_select_flush(); EM_select_flush();
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
return 1; return 1;
@@ -5079,6 +5117,8 @@ int EdgeSlide(short immediate, float imperc)
} }
force_draw(0); force_draw(0);
EM_automerge(0);
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
scrarea_queue_winredraw(curarea); scrarea_queue_winredraw(curarea);
@@ -6113,7 +6153,7 @@ int collapseEdges(void)
} }
freecollections(&allcollections); freecollections(&allcollections);
removedoublesflag(1, MERGELIMIT); removedoublesflag(1, 0, MERGELIMIT);
/*get rid of this!*/ /*get rid of this!*/
countall(); countall();
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
@@ -6157,7 +6197,7 @@ int merge_firstlast(int first, int uvmerge)
} }
countall(); countall();
return removedoublesflag(1,MERGELIMIT); return removedoublesflag(1, 0, MERGELIMIT);
} }
int merge_target(int target, int uvmerge) int merge_target(int target, int uvmerge)
@@ -6180,7 +6220,7 @@ int merge_target(int target, int uvmerge)
countall(); countall();
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWVIEW3D, 0);
return removedoublesflag(1,MERGELIMIT); return removedoublesflag(1, 0, MERGELIMIT);
} }
#undef MERGELIMIT #undef MERGELIMIT

2
source/blender/src/editobject.c
View File

@@ -2429,7 +2429,7 @@ void special_editmenu(void)
mergemenu(); mergemenu();
break; break;
case 5: case 5:
notice("Removed %d Vertices", removedoublesflag(1, G.scene->toolsettings->doublimit)); notice("Removed %d Vertices", removedoublesflag(1, 1, G.scene->toolsettings->doublimit));
BIF_undo_push("Remove Doubles"); BIF_undo_push("Remove Doubles");
break; break;
case 6: case 6:

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

@@ -2536,7 +2536,7 @@ void do_view3d_edit_mesh_verticesmenu(void *arg, int event)
make_parent(); make_parent();
break; break;
case 1: /* remove doubles */ case 1: /* remove doubles */
count= removedoublesflag(1, G.scene->toolsettings->doublimit); count= removedoublesflag(1, 0, G.scene->toolsettings->doublimit);
notice("Removed: %d", count); notice("Removed: %d", count);
if (count) { /* only undo and redraw if an action is taken */ if (count) { /* only undo and redraw if an action is taken */
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
@@ -2978,8 +2978,12 @@ static void do_view3d_edit_meshmenu(void *arg, int event)
if(G.scene->proportional) G.scene->proportional= 0; if(G.scene->proportional) G.scene->proportional= 0;
else G.scene->proportional= 1; else G.scene->proportional= 1;
break; break;
case 13: /* automerge edit (toggle) */
if(G.scene->automerge) G.scene->automerge= 0;
else G.scene->automerge= 1;
break;
#ifdef WITH_VERSE #ifdef WITH_VERSE
case 13: case 14:
if(session_list.first != session_list.last) session = session_menu(); if(session_list.first != session_list.last) session = session_menu();
else session = session_list.first; else session = session_list.first;
if(session) b_verse_push_object(session, G.obedit); if(session) b_verse_push_object(session, G.obedit);
@@ -3001,7 +3005,7 @@ static uiBlock *view3d_edit_meshmenu(void *arg_unused)
#ifdef WITH_VERSE #ifdef WITH_VERSE
if((session_list.first != NULL) && (!G.obedit->vnode)) { if((session_list.first != NULL) && (!G.obedit->vnode)) {
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Share at Verse Server", uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Share at Verse Server",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, ""); 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 14, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
} }
#endif #endif
@@ -3037,6 +3041,8 @@ static uiBlock *view3d_edit_meshmenu(void *arg_unused)
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
if(G.scene->proportional) { if(G.scene->proportional) {
uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Proportional Editing|O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, ""); uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Proportional Editing|O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 12, "");
} else { } else {
@@ -3046,6 +3052,14 @@ static uiBlock *view3d_edit_meshmenu(void *arg_unused)
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); 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, "AutoMarge Editing", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, "");
} else {
uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "AutoMarge 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, "");
uiDefIconTextBlockBut(block, view3d_edit_mesh_showhidemenu, NULL, ICON_RIGHTARROW_THIN, "Show/Hide Vertices", 0, yco-=20, 120, 19, ""); uiDefIconTextBlockBut(block, view3d_edit_mesh_showhidemenu, NULL, ICON_RIGHTARROW_THIN, "Show/Hide Vertices", 0, yco-=20, 120, 19, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");

5
source/blender/src/transform_conversions.c
View File

@@ -125,6 +125,8 @@
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
#include "BLI_editVert.h" #include "BLI_editVert.h"
#include "editmesh.h"
#include "blendef.h" #include "blendef.h"
#include "mydevice.h" #include "mydevice.h"
@@ -2733,6 +2735,9 @@ void special_aftertrans_update(TransInfo *t)
short redrawipo=0, resetslowpar=1; short redrawipo=0, resetslowpar=1;
int cancelled= (t->state == TRANS_CANCEL); int cancelled= (t->state == TRANS_CANCEL);
if (t->spacetype==SPACE_VIEW3D)
EM_automerge(1);
if(t->spacetype == SPACE_ACTION) { if(t->spacetype == SPACE_ACTION) {
void *data; void *data;
short datatype; short datatype;