Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
-rw-r--r--source/blender/editors/mesh/meshtools.c576
1 files changed, 292 insertions, 284 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 7d0172b3c15..37922b6e693 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -91,21 +91,21 @@
int join_mesh_exec(bContext *C, wmOperator *op)
{
- Main *bmain= CTX_data_main(C);
- Scene *scene= CTX_data_scene(C);
- Object *ob= CTX_data_active_object(C);
+ Main *bmain = CTX_data_main(C);
+ Scene *scene = CTX_data_scene(C);
+ Object *ob = CTX_data_active_object(C);
Material **matar, *ma;
Mesh *me;
MVert *mvert, *mv;
MEdge *medge = NULL;
MPoly *mpoly = NULL;
MLoop *mloop = NULL;
- Key *key, *nkey=NULL;
+ Key *key, *nkey = NULL;
KeyBlock *kb, *okb, *kbn;
float imat[4][4], cmat[4][4], *fp1, *fp2, curpos;
- int a, b, totcol, totmat=0, totedge=0, totvert=0, ok=0;
- int totloop=0, totpoly=0, vertofs, *matmap=NULL;
- int i, j, index, haskey=0, edgeofs, loopofs, polyofs;
+ int a, b, totcol, totmat = 0, totedge = 0, totvert = 0, ok = 0;
+ int totloop = 0, totpoly = 0, vertofs, *matmap = NULL;
+ int i, j, index, haskey = 0, edgeofs, loopofs, polyofs;
bDeformGroup *dg, *odg;
MDeformVert *dvert;
CustomData vdata, edata, fdata, ldata, pdata;
@@ -116,24 +116,24 @@ int join_mesh_exec(bContext *C, wmOperator *op)
}
/* ob is the object we are adding geometry to */
- if (!ob || ob->type!=OB_MESH) {
+ if (!ob || ob->type != OB_MESH) {
BKE_report(op->reports, RPT_WARNING, "Active object is not a mesh");
return OPERATOR_CANCELLED;
}
/* count & check */
- CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
- if (base->object->type==OB_MESH) {
- me= base->object->data;
-
- totvert+= me->totvert;
- totedge+= me->totedge;
- totloop+= me->totloop;
- totpoly+= me->totpoly;
- totmat+= base->object->totcol;
+ CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases) {
+ if (base->object->type == OB_MESH) {
+ me = base->object->data;
+
+ totvert += me->totvert;
+ totedge += me->totedge;
+ totloop += me->totloop;
+ totpoly += me->totpoly;
+ totmat += base->object->totcol;
if (base->object == ob)
- ok= 1;
+ ok = 1;
/* check for shapekeys */
if (me->key)
@@ -143,16 +143,16 @@ int join_mesh_exec(bContext *C, wmOperator *op)
CTX_DATA_END;
/* that way the active object is always selected */
- if (ok==0) {
+ if (ok == 0) {
BKE_report(op->reports, RPT_WARNING, "Active object is not a selected mesh");
return OPERATOR_CANCELLED;
}
/* only join meshes if there are verts to join, there aren't too many, and we only had one mesh selected */
- me= (Mesh *)ob->data;
- key= me->key;
+ me = (Mesh *)ob->data;
+ key = me->key;
- if (totvert==0 || totvert==me->totvert) {
+ if (totvert == 0 || totvert == me->totvert) {
BKE_report(op->reports, RPT_WARNING, "No mesh data to join");
return OPERATOR_CANCELLED;
}
@@ -163,48 +163,49 @@ int join_mesh_exec(bContext *C, wmOperator *op)
}
/* new material indices and material array */
- matar= MEM_callocN(sizeof(void*)*totmat, "join_mesh matar");
- if (totmat) matmap= MEM_callocN(sizeof(int)*totmat, "join_mesh matmap");
- totcol= ob->totcol;
+ matar = MEM_callocN(sizeof(void *) * totmat, "join_mesh matar");
+ if (totmat) matmap = MEM_callocN(sizeof(int) * totmat, "join_mesh matmap");
+ totcol = ob->totcol;
/* obact materials in new main array, is nicer start! */
- for (a=0; a<ob->totcol; a++) {
- matar[a]= give_current_material(ob, a+1);
+ for (a = 0; a < ob->totcol; a++) {
+ matar[a] = give_current_material(ob, a + 1);
id_us_plus((ID *)matar[a]);
/* increase id->us : will be lowered later */
}
/* - if destination mesh had shapekeys, move them somewhere safe, and set up placeholders
- * with arrays that are large enough to hold shapekey data for all meshes
+ * with arrays that are large enough to hold shapekey data for all meshes
* - if destination mesh didn't have shapekeys, but we encountered some in the meshes we're
* joining, set up a new keyblock and assign to the mesh
*/
if (key) {
/* make a duplicate copy that will only be used here... (must remember to free it!) */
- nkey= copy_key(key);
+ nkey = copy_key(key);
/* for all keys in old block, clear data-arrays */
- for (kb= key->block.first; kb; kb= kb->next) {
+ for (kb = key->block.first; kb; kb = kb->next) {
if (kb->data) MEM_freeN(kb->data);
- kb->data= MEM_callocN(sizeof(float)*3*totvert, "join_shapekey");
- kb->totelem= totvert;
- kb->weights= NULL;
+ kb->data = MEM_callocN(sizeof(float) * 3 * totvert, "join_shapekey");
+ kb->totelem = totvert;
+ kb->weights = NULL;
}
}
else if (haskey) {
/* add a new key-block and add to the mesh */
- key= me->key= add_key((ID *)me);
+ key = me->key = add_key((ID *)me);
key->type = KEY_RELATIVE;
}
/* first pass over objects - copying materials and vertexgroups across */
- CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+ CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
+ {
/* only act if a mesh, and not the one we're joining to */
- if ((ob!=base->object) && (base->object->type==OB_MESH)) {
- me= base->object->data;
+ if ((ob != base->object) && (base->object->type == OB_MESH)) {
+ me = base->object->data;
/* Join this object's vertex groups to the base one's */
- for (dg=base->object->defbase.first; dg; dg=dg->next) {
+ for (dg = base->object->defbase.first; dg; dg = dg->next) {
/* See if this group exists in the object (if it doesn't, add it to the end) */
if (!defgroup_find_name(ob, dg->name)) {
odg = MEM_callocN(sizeof(bDeformGroup), "join deformGroup");
@@ -212,21 +213,21 @@ int join_mesh_exec(bContext *C, wmOperator *op)
BLI_addtail(&ob->defbase, odg);
}
}
- if (ob->defbase.first && ob->actdef==0)
- ob->actdef=1;
+ if (ob->defbase.first && ob->actdef == 0)
+ ob->actdef = 1;
if (me->totvert) {
/* Add this object's materials to the base one's if they don't exist already (but only if limits not exceeded yet) */
if (totcol < MAXMAT) {
- for (a=1; a<=base->object->totcol; a++) {
- ma= give_current_material(base->object, a);
+ for (a = 1; a <= base->object->totcol; a++) {
+ ma = give_current_material(base->object, a);
- for (b=0; b<totcol; b++) {
+ for (b = 0; b < totcol; b++) {
if (ma == matar[b]) break;
}
- if (b==totcol) {
- matar[b]= ma;
+ if (b == totcol) {
+ matar[b] = ma;
if (ma) {
id_us_plus(&ma->id);
}
@@ -239,29 +240,29 @@ int join_mesh_exec(bContext *C, wmOperator *op)
/* if this mesh has shapekeys, check if destination mesh already has matching entries too */
if (me->key && key) {
- for (kb= me->key->block.first; kb; kb= kb->next) {
+ for (kb = me->key->block.first; kb; kb = kb->next) {
/* if key doesn't exist in destination mesh, add it */
if (key_get_named_keyblock(key, kb->name) == NULL) {
/* copy this existing one over to the new shapekey block */
- kbn= MEM_dupallocN(kb);
- kbn->prev= kbn->next= NULL;
+ kbn = MEM_dupallocN(kb);
+ kbn->prev = kbn->next = NULL;
/* adjust adrcode and other settings to fit (allocate a new data-array) */
- kbn->data= MEM_callocN(sizeof(float)*3*totvert, "joined_shapekey");
- kbn->totelem= totvert;
- kbn->weights= NULL;
+ kbn->data = MEM_callocN(sizeof(float) * 3 * totvert, "joined_shapekey");
+ kbn->totelem = totvert;
+ kbn->weights = NULL;
- okb= key->block.last;
- curpos= (okb) ? okb->pos : -0.1f;
+ okb = key->block.last;
+ curpos = (okb) ? okb->pos : -0.1f;
if (key->type == KEY_RELATIVE)
- kbn->pos= curpos + 0.1f;
+ kbn->pos = curpos + 0.1f;
else
- kbn->pos= curpos;
+ kbn->pos = curpos;
BLI_addtail(&key->block, kbn);
- kbn->adrcode= key->totkey;
+ kbn->adrcode = key->totkey;
key->totkey++;
- if (key->totkey==1) key->refkey= kbn;
+ if (key->totkey == 1) key->refkey = kbn;
// XXX 2.5 Animato
#if 0
@@ -286,23 +287,24 @@ int join_mesh_exec(bContext *C, wmOperator *op)
memset(&ldata, 0, sizeof(ldata));
memset(&pdata, 0, sizeof(pdata));
- mvert= CustomData_add_layer(&vdata, CD_MVERT, CD_CALLOC, NULL, totvert);
- medge= CustomData_add_layer(&edata, CD_MEDGE, CD_CALLOC, NULL, totedge);
- mloop= CustomData_add_layer(&ldata, CD_MLOOP, CD_CALLOC, NULL, totloop);
- mpoly= CustomData_add_layer(&pdata, CD_MPOLY, CD_CALLOC, NULL, totpoly);
-
- vertofs= 0;
- edgeofs= 0;
- loopofs= 0;
- polyofs= 0;
+ mvert = CustomData_add_layer(&vdata, CD_MVERT, CD_CALLOC, NULL, totvert);
+ medge = CustomData_add_layer(&edata, CD_MEDGE, CD_CALLOC, NULL, totedge);
+ mloop = CustomData_add_layer(&ldata, CD_MLOOP, CD_CALLOC, NULL, totloop);
+ mpoly = CustomData_add_layer(&pdata, CD_MPOLY, CD_CALLOC, NULL, totpoly);
+
+ vertofs = 0;
+ edgeofs = 0;
+ loopofs = 0;
+ polyofs = 0;
/* inverse transform for all selected meshes in this object */
invert_m4_m4(imat, ob->obmat);
- CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+ CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
+ {
/* only join if this is a mesh */
- if (base->object->type==OB_MESH) {
- me= base->object->data;
+ if (base->object->type == OB_MESH) {
+ me = base->object->data;
if (me->totvert) {
/* standard data */
@@ -310,17 +312,17 @@ int join_mesh_exec(bContext *C, wmOperator *op)
CustomData_copy_data(&me->vdata, &vdata, 0, vertofs, me->totvert);
/* vertex groups */
- dvert= CustomData_get(&vdata, vertofs, CD_MDEFORMVERT);
+ dvert = CustomData_get(&vdata, vertofs, CD_MDEFORMVERT);
/* NB: vertex groups here are new version */
if (dvert) {
- for (i=0; i<me->totvert; i++) {
- for (j=0; j<dvert[i].totweight; j++) {
+ for (i = 0; i < me->totvert; i++) {
+ for (j = 0; j < dvert[i].totweight; j++) {
/* Find the old vertex group */
odg = BLI_findlink(&base->object->defbase, dvert[i].dw[j].def_nr);
if (odg) {
/* Search for a match in the new object, and set new index */
- for (dg=ob->defbase.first, index=0; dg; dg=dg->next, index++) {
+ for (dg = ob->defbase.first, index = 0; dg; dg = dg->next, index++) {
if (!strcmp(dg->name, odg->name)) {
dvert[i].dw[j].def_nr = index;
break;
@@ -337,7 +339,7 @@ int join_mesh_exec(bContext *C, wmOperator *op)
mult_m4_m4m4(cmat, imat, base->object->obmat);
/* transform vertex coordinates into new space */
- for (a=0, mv=mvert; a < me->totvert; a++, mv++) {
+ for (a = 0, mv = mvert; a < me->totvert; a++, mv++) {
mul_m4_v3(cmat, mv->co);
}
@@ -347,24 +349,24 @@ int join_mesh_exec(bContext *C, wmOperator *op)
*/
if (key) {
/* if this mesh has any shapekeys, check first, otherwise just copy coordinates */
- for (kb= key->block.first; kb; kb= kb->next) {
+ for (kb = key->block.first; kb; kb = kb->next) {
/* get pointer to where to write data for this mesh in shapekey's data array */
- fp1= ((float *)kb->data) + (vertofs*3);
+ fp1 = ((float *)kb->data) + (vertofs * 3);
/* check if this mesh has such a shapekey */
- okb= key_get_named_keyblock(me->key, kb->name);
+ okb = key_get_named_keyblock(me->key, kb->name);
if (okb) {
/* copy this mesh's shapekey to the destination shapekey (need to transform first) */
- fp2= ((float *)(okb->data));
- for (a=0; a < me->totvert; a++, fp1+=3, fp2+=3) {
+ fp2 = ((float *)(okb->data));
+ for (a = 0; a < me->totvert; a++, fp1 += 3, fp2 += 3) {
copy_v3_v3(fp1, fp2);
mul_m4_v3(cmat, fp1);
}
}
else {
/* copy this mesh's vertex coordinates to the destination shapekey */
- mv= mvert;
- for (a=0; a < me->totvert; a++, fp1+=3, mv++) {
+ mv = mvert;
+ for (a = 0; a < me->totvert; a++, fp1 += 3, mv++) {
copy_v3_v3(fp1, mv->co);
}
}
@@ -377,23 +379,23 @@ int join_mesh_exec(bContext *C, wmOperator *op)
* - otherwise, copy across plain coordinates (no need to transform coordinates)
*/
if (key) {
- for (kb= key->block.first; kb; kb= kb->next) {
+ for (kb = key->block.first; kb; kb = kb->next) {
/* get pointer to where to write data for this mesh in shapekey's data array */
- fp1= ((float *)kb->data) + (vertofs*3);
+ fp1 = ((float *)kb->data) + (vertofs * 3);
/* check if this was one of the original shapekeys */
- okb= key_get_named_keyblock(nkey, kb->name);
+ okb = key_get_named_keyblock(nkey, kb->name);
if (okb) {
/* copy this mesh's shapekey to the destination shapekey */
- fp2= ((float *)(okb->data));
- for (a=0; a < me->totvert; a++, fp1+=3, fp2+=3) {
+ fp2 = ((float *)(okb->data));
+ for (a = 0; a < me->totvert; a++, fp1 += 3, fp2 += 3) {
copy_v3_v3(fp1, fp2);
}
}
else {
/* copy base-coordinates to the destination shapekey */
- mv= mvert;
- for (a=0; a < me->totvert; a++, fp1+=3, mv++) {
+ mv = mvert;
+ for (a = 0; a < me->totvert; a++, fp1 += 3, mv++) {
copy_v3_v3(fp1, mv->co);
}
}
@@ -402,27 +404,27 @@ int join_mesh_exec(bContext *C, wmOperator *op)
}
/* advance mvert pointer to end of base mesh's data */
- mvert+= me->totvert;
+ mvert += me->totvert;
}
if (me->totedge) {
CustomData_merge(&me->edata, &edata, CD_MASK_MESH, CD_DEFAULT, totedge);
CustomData_copy_data(&me->edata, &edata, 0, edgeofs, me->totedge);
- for (a=0; a<me->totedge; a++, medge++) {
- medge->v1+= vertofs;
- medge->v2+= vertofs;
+ for (a = 0; a < me->totedge; a++, medge++) {
+ medge->v1 += vertofs;
+ medge->v2 += vertofs;
}
}
if (me->totloop) {
- if (base->object!=ob)
+ if (base->object != ob)
multiresModifier_prepare_join(scene, base->object, ob);
CustomData_merge(&me->ldata, &ldata, CD_MASK_MESH, CD_DEFAULT, totloop);
CustomData_copy_data(&me->ldata, &ldata, 0, loopofs, me->totloop);
- for (a=0; a<me->totloop; a++, mloop++) {
+ for (a = 0; a < me->totloop; a++, mloop++) {
mloop->v += vertofs;
mloop->e += edgeofs;
}
@@ -430,12 +432,12 @@ int join_mesh_exec(bContext *C, wmOperator *op)
if (me->totpoly) {
/* make mapping for materials */
- for (a=1; a<=base->object->totcol; a++) {
- ma= give_current_material(base->object, a);
+ for (a = 1; a <= base->object->totcol; a++) {
+ ma = give_current_material(base->object, a);
- for (b=0; b<totcol; b++) {
+ for (b = 0; b < totcol; b++) {
if (ma == matar[b]) {
- matmap[a-1]= b;
+ matmap[a - 1] = b;
break;
}
}
@@ -444,9 +446,9 @@ int join_mesh_exec(bContext *C, wmOperator *op)
CustomData_merge(&me->pdata, &pdata, CD_MASK_MESH, CD_DEFAULT, totpoly);
CustomData_copy_data(&me->pdata, &pdata, 0, polyofs, me->totpoly);
- for (a=0; a<me->totpoly; a++, mpoly++) {
+ for (a = 0; a < me->totpoly; a++, mpoly++) {
mpoly->loopstart += loopofs;
- mpoly->mat_nr= matmap ? matmap[(int)mpoly->mat_nr] : 0;
+ mpoly->mat_nr = matmap ? matmap[(int)mpoly->mat_nr] : 0;
}
polyofs += me->totpoly;
@@ -467,49 +469,49 @@ int join_mesh_exec(bContext *C, wmOperator *op)
CTX_DATA_END;
/* return to mesh we're merging to */
- me= ob->data;
+ me = ob->data;
CustomData_free(&me->vdata, me->totvert);
CustomData_free(&me->edata, me->totedge);
CustomData_free(&me->ldata, me->totloop);
CustomData_free(&me->pdata, me->totpoly);
- me->totvert= totvert;
- me->totedge= totedge;
- me->totloop= totloop;
- me->totpoly= totpoly;
-
- me->vdata= vdata;
- me->edata= edata;
- me->ldata= ldata;
- me->pdata= pdata;
+ me->totvert = totvert;
+ me->totedge = totedge;
+ me->totloop = totloop;
+ me->totpoly = totpoly;
+
+ me->vdata = vdata;
+ me->edata = edata;
+ me->ldata = ldata;
+ me->pdata = pdata;
mesh_update_customdata_pointers(me, TRUE); /* BMESH_TODO, check if this arg can be failse, non urgent - campbell */
/* old material array */
- for (a=1; a<=ob->totcol; a++) {
- ma= ob->mat[a-1];
+ for (a = 1; a <= ob->totcol; a++) {
+ ma = ob->mat[a - 1];
if (ma) ma->id.us--;
}
- for (a=1; a<=me->totcol; a++) {
- ma= me->mat[a-1];
+ for (a = 1; a <= me->totcol; a++) {
+ ma = me->mat[a - 1];
if (ma) ma->id.us--;
}
if (ob->mat) MEM_freeN(ob->mat);
if (ob->matbits) MEM_freeN(ob->matbits);
if (me->mat) MEM_freeN(me->mat);
- ob->mat= me->mat= NULL;
- ob->matbits= NULL;
+ ob->mat = me->mat = NULL;
+ ob->matbits = NULL;
if (totcol) {
- me->mat= matar;
- ob->mat= MEM_callocN(sizeof(void *)*totcol, "join obmatar");
- ob->matbits= MEM_callocN(sizeof(char)*totcol, "join obmatbits");
+ me->mat = matar;
+ ob->mat = MEM_callocN(sizeof(void *) * totcol, "join obmatar");
+ ob->matbits = MEM_callocN(sizeof(char) * totcol, "join obmatbits");
}
else
MEM_freeN(matar);
- ob->totcol= me->totcol= totcol;
+ ob->totcol = me->totcol = totcol;
if (matmap) MEM_freeN(matmap);
@@ -533,21 +535,21 @@ int join_mesh_exec(bContext *C, wmOperator *op)
MEM_freeN(nkey);
}
- DAG_scene_sort(bmain, scene); // removed objects, need to rebuild dag before editmode call
+ DAG_scene_sort(bmain, scene); // removed objects, need to rebuild dag before editmode call
#if 0
ED_object_enter_editmode(C, EM_WAITCURSOR);
- ED_object_exit_editmode(C, EM_FREEDATA|EM_WAITCURSOR|EM_DO_UNDO);
+ ED_object_exit_editmode(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO);
#else
/* toggle editmode using lower level functions so this can be called from python */
- EDBM_MakeEditBMesh(scene->toolsettings, scene, ob);
- EDBM_LoadEditBMesh(scene, ob);
- EDBM_FreeEditBMesh(me->edit_btmesh);
+ EDBM_mesh_make(scene->toolsettings, scene, ob);
+ EDBM_mesh_load(ob);
+ EDBM_mesh_free(me->edit_btmesh);
MEM_freeN(me->edit_btmesh);
- me->edit_btmesh= NULL;
- DAG_id_tag_update(&ob->id, OB_RECALC_OB|OB_RECALC_DATA);
+ me->edit_btmesh = NULL;
+ DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
#endif
- WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
return OPERATOR_FINISHED;
}
@@ -559,25 +561,25 @@ int join_mesh_exec(bContext *C, wmOperator *op)
int join_mesh_shapes_exec(bContext *C, wmOperator *op)
{
- Scene *scene= CTX_data_scene(C);
- Object *ob= CTX_data_active_object(C);
- Mesh *me= (Mesh *)ob->data;
- Mesh *selme=NULL;
- DerivedMesh *dm=NULL;
- Key *key=me->key;
+ Scene *scene = CTX_data_scene(C);
+ Object *ob = CTX_data_active_object(C);
+ Mesh *me = (Mesh *)ob->data;
+ Mesh *selme = NULL;
+ DerivedMesh *dm = NULL;
+ Key *key = me->key;
KeyBlock *kb;
- int ok=0, nonequal_verts=0;
+ int ok = 0, nonequal_verts = 0;
- CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+ CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases) {
if (base->object == ob) continue;
- if (base->object->type==OB_MESH) {
+ if (base->object->type == OB_MESH) {
selme = (Mesh *)base->object->data;
- if (selme->totvert==me->totvert)
+ if (selme->totvert == me->totvert)
ok++;
else
- nonequal_verts=1;
+ nonequal_verts = 1;
}
}
CTX_DATA_END;
@@ -591,27 +593,28 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
}
if (key == NULL) {
- key= me->key= add_key((ID *)me);
- key->type= KEY_RELATIVE;
+ key = me->key = add_key((ID *)me);
+ key->type = KEY_RELATIVE;
/* first key added, so it was the basis. initialize it with the existing mesh */
- kb= add_keyblock(key, NULL);
+ kb = add_keyblock(key, NULL);
mesh_to_key(me, kb);
}
/* now ready to add new keys from selected meshes */
- CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
+ CTX_DATA_BEGIN(C, Base *, base, selected_editable_bases)
+ {
if (base->object == ob) continue;
- if (base->object->type==OB_MESH) {
+ if (base->object->type == OB_MESH) {
selme = (Mesh *)base->object->data;
- if (selme->totvert==me->totvert) {
+ if (selme->totvert == me->totvert) {
dm = mesh_get_derived_deform(scene, base->object, CD_MASK_BAREMESH);
if (!dm) continue;
- kb= add_keyblock(key, base->object->id.name+2);
+ kb = add_keyblock(key, base->object->id.name + 2);
DM_to_meshkey(dm, me, kb);
@@ -621,7 +624,7 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
}
CTX_DATA_END;
- WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE, scene);
+ WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene);
return OPERATOR_FINISHED;
}
@@ -630,9 +633,9 @@ int join_mesh_shapes_exec(bContext *C, wmOperator *op)
/* important note; this is unfinished, needs better API for editmode, and custom threshold */
-#define MOC_RES 8
-#define MOC_NODE_RES 8
-#define MOC_THRESH 0.00002f
+#define MOC_RES 8
+#define MOC_NODE_RES 8
+#define MOC_THRESH 0.00002f
typedef struct MocNode {
struct MocNode *next;
@@ -643,30 +646,30 @@ static int mesh_octree_get_base_offs(float *co, float *offs, float *div)
{
int vx, vy, vz;
- vx= floor( (co[0]-offs[0])/div[0] );
- vy= floor( (co[1]-offs[1])/div[1] );
- vz= floor( (co[2]-offs[2])/div[2] );
-
- CLAMP(vx, 0, MOC_RES-1);
- CLAMP(vy, 0, MOC_RES-1);
- CLAMP(vz, 0, MOC_RES-1);
+ vx = floor( (co[0] - offs[0]) / div[0]);
+ vy = floor( (co[1] - offs[1]) / div[1]);
+ vz = floor( (co[2] - offs[2]) / div[2]);
- return (vx*MOC_RES*MOC_RES) + vy*MOC_RES + vz;
+ CLAMP(vx, 0, MOC_RES - 1);
+ CLAMP(vy, 0, MOC_RES - 1);
+ CLAMP(vz, 0, MOC_RES - 1);
+
+ return (vx * MOC_RES * MOC_RES) + vy * MOC_RES + vz;
}
static void mesh_octree_add_node(MocNode **bt, intptr_t index)
{
- if (*bt==NULL) {
- *bt= MEM_callocN(sizeof(MocNode), "MocNode");
- (*bt)->index[0]= index;
+ if (*bt == NULL) {
+ *bt = MEM_callocN(sizeof(MocNode), "MocNode");
+ (*bt)->index[0] = index;
}
else {
int a;
- for (a=0; a<MOC_NODE_RES; a++) {
- if ((*bt)->index[a]==index)
+ for (a = 0; a < MOC_NODE_RES; a++) {
+ if ((*bt)->index[a] == index)
return;
- else if ((*bt)->index[a]==0) {
- (*bt)->index[a]= index;
+ else if ((*bt)->index[a] == 0) {
+ (*bt)->index[a] = index;
return;
}
}
@@ -676,7 +679,7 @@ static void mesh_octree_add_node(MocNode **bt, intptr_t index)
static void mesh_octree_free_node(MocNode **bt)
{
- if ( (*bt)->next ) {
+ if ( (*bt)->next) {
mesh_octree_free_node(&(*bt)->next);
}
MEM_freeN(*bt);
@@ -684,52 +687,52 @@ static void mesh_octree_free_node(MocNode **bt)
/* temporal define, just to make nicer code below */
-#define MOC_INDEX(vx, vy, vz) (((vx)*MOC_RES*MOC_RES) + (vy)*MOC_RES + (vz))
+#define MOC_INDEX(vx, vy, vz) (((vx) * MOC_RES * MOC_RES) + (vy) * MOC_RES + (vz))
static void mesh_octree_add_nodes(MocNode **basetable, float *co, float *offs, float *div, intptr_t index)
{
float fx, fy, fz;
int vx, vy, vz;
- if ( !finite(co[0]) ||
- !finite(co[1]) ||
- !finite(co[2]))
+ if (!finite(co[0]) ||
+ !finite(co[1]) ||
+ !finite(co[2]))
{
return;
}
- fx= (co[0]-offs[0])/div[0];
- fy= (co[1]-offs[1])/div[1];
- fz= (co[2]-offs[2])/div[2];
- CLAMP(fx, 0.0f, MOC_RES-MOC_THRESH);
- CLAMP(fy, 0.0f, MOC_RES-MOC_THRESH);
- CLAMP(fz, 0.0f, MOC_RES-MOC_THRESH);
-
- vx= (int)floorf(fx);
- vy= (int)floorf(fy);
- vz= (int)floorf(fz);
+ fx = (co[0] - offs[0]) / div[0];
+ fy = (co[1] - offs[1]) / div[1];
+ fz = (co[2] - offs[2]) / div[2];
+ CLAMP(fx, 0.0f, MOC_RES - MOC_THRESH);
+ CLAMP(fy, 0.0f, MOC_RES - MOC_THRESH);
+ CLAMP(fz, 0.0f, MOC_RES - MOC_THRESH);
+
+ vx = (int)floorf(fx);
+ vy = (int)floorf(fy);
+ vz = (int)floorf(fz);
mesh_octree_add_node(basetable + MOC_INDEX(vx, vy, vz), index);
if (vx > 0)
- if (fx-((float)vx)-MOC_THRESH < 0.0f)
+ if (fx - ((float)vx) - MOC_THRESH < 0.0f)
mesh_octree_add_node(basetable + MOC_INDEX(vx - 1, vy, vz), index);
if (vx < MOC_RES - 2)
- if (fx-((float)vx)+MOC_THRESH > 1.0f)
+ if (fx - ((float)vx) + MOC_THRESH > 1.0f)
mesh_octree_add_node(basetable + MOC_INDEX(vx + 1, vy, vz), index);
if (vy > 0)
- if (fy-((float)vy)-MOC_THRESH < 0.0f)
+ if (fy - ((float)vy) - MOC_THRESH < 0.0f)
mesh_octree_add_node(basetable + MOC_INDEX(vx, vy - 1, vz), index);
if (vy < MOC_RES - 2)
- if (fy-((float)vy)+MOC_THRESH > 1.0f)
+ if (fy - ((float)vy) + MOC_THRESH > 1.0f)
mesh_octree_add_node(basetable + MOC_INDEX(vx, vy + 1, vz), index);
if (vz > 0)
- if (fz-((float)vz)-MOC_THRESH < 0.0f)
+ if (fz - ((float)vz) - MOC_THRESH < 0.0f)
mesh_octree_add_node(basetable + MOC_INDEX(vx, vy, vz - 1), index);
- if (vz <MOC_RES - 2)
- if (fz-((float)vz)+MOC_THRESH > 1.0f)
+ if (vz < MOC_RES - 2)
+ if (fz - ((float)vz) + MOC_THRESH > 1.0f)
mesh_octree_add_node(basetable + MOC_INDEX(vx, vy, vz + 1), index);
}
@@ -739,19 +742,19 @@ static intptr_t mesh_octree_find_index(MocNode **bt, MVert *mvert, float *co)
float *vec;
int a;
- if (*bt==NULL)
+ if (*bt == NULL)
return -1;
- for (a=0; a<MOC_NODE_RES; a++) {
+ for (a = 0; a < MOC_NODE_RES; a++) {
if ((*bt)->index[a]) {
/* does mesh verts and editmode, code looks potential dangerous, octree should really be filled OK! */
if (mvert) {
- vec= (mvert+(*bt)->index[a]-1)->co;
+ vec = (mvert + (*bt)->index[a] - 1)->co;
if (compare_v3v3(vec, co, MOC_THRESH))
- return (*bt)->index[a]-1;
+ return (*bt)->index[a] - 1;
}
else {
- BMVert *eve= (BMVert *)((*bt)->index[a]);
+ BMVert *eve = (BMVert *)((*bt)->index[a]);
if (compare_v3v3(eve->co, co, MOC_THRESH))
return (*bt)->index[a];
}
@@ -775,13 +778,13 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode)
{
MocNode **bt;
- if (mode=='u') { /* use table */
- if (MeshOctree.table==NULL)
+ if (mode == 'u') { /* use table */
+ if (MeshOctree.table == NULL)
mesh_octree_table(ob, em, NULL, 's');
if (MeshOctree.table) {
- Mesh *me= ob->data;
- bt= MeshOctree.table + mesh_octree_get_base_offs(co, MeshOctree.offs, MeshOctree.div);
+ Mesh *me = ob->data;
+ bt = MeshOctree.table + mesh_octree_get_base_offs(co, MeshOctree.offs, MeshOctree.div);
if (em)
return mesh_octree_find_index(bt, NULL, co);
else
@@ -789,19 +792,20 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode)
}
return -1;
}
- else if (mode=='s') { /* start table */
- Mesh *me= ob->data;
+ else if (mode == 's') { /* start table */
+ Mesh *me = ob->data;
float min[3], max[3];
/* we compute own bounding box and don't reuse ob->bb because
* we are using the undeformed coordinates*/
INIT_MINMAX(min, max);
- if (em && me->edit_btmesh==em) {
+ if (em && me->edit_btmesh == em) {
BMIter iter;
BMVert *eve;
- BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL)
+ {
DO_MINMAX(eve->co, min, max);
}
}
@@ -809,36 +813,37 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode)
MVert *mvert;
int a;
- for (a=0, mvert= me->mvert; a<me->totvert; a++, mvert++)
+ for (a = 0, mvert = me->mvert; a < me->totvert; a++, mvert++)
DO_MINMAX(mvert->co, min, max);
}
/* for quick unit coordinate calculus */
copy_v3_v3(MeshOctree.offs, min);
- MeshOctree.offs[0]-= MOC_THRESH; /* we offset it 1 threshold unit extra */
- MeshOctree.offs[1]-= MOC_THRESH;
- MeshOctree.offs[2]-= MOC_THRESH;
+ MeshOctree.offs[0] -= MOC_THRESH; /* we offset it 1 threshold unit extra */
+ MeshOctree.offs[1] -= MOC_THRESH;
+ MeshOctree.offs[2] -= MOC_THRESH;
sub_v3_v3v3(MeshOctree.div, max, min);
- MeshOctree.div[0]+= 2*MOC_THRESH; /* and divide with 2 threshold unit more extra (try 8x8 unit grid on paint) */
- MeshOctree.div[1]+= 2*MOC_THRESH;
- MeshOctree.div[2]+= 2*MOC_THRESH;
-
- mul_v3_fl(MeshOctree.div, 1.0f/MOC_RES);
- if (MeshOctree.div[0]==0.0f) MeshOctree.div[0]= 1.0f;
- if (MeshOctree.div[1]==0.0f) MeshOctree.div[1]= 1.0f;
- if (MeshOctree.div[2]==0.0f) MeshOctree.div[2]= 1.0f;
+ MeshOctree.div[0] += 2 * MOC_THRESH; /* and divide with 2 threshold unit more extra (try 8x8 unit grid on paint) */
+ MeshOctree.div[1] += 2 * MOC_THRESH;
+ MeshOctree.div[2] += 2 * MOC_THRESH;
+
+ mul_v3_fl(MeshOctree.div, 1.0f / MOC_RES);
+ if (MeshOctree.div[0] == 0.0f) MeshOctree.div[0] = 1.0f;
+ if (MeshOctree.div[1] == 0.0f) MeshOctree.div[1] = 1.0f;
+ if (MeshOctree.div[2] == 0.0f) MeshOctree.div[2] = 1.0f;
if (MeshOctree.table) /* happens when entering this call without ending it */
mesh_octree_table(ob, em, co, 'e');
- MeshOctree.table= MEM_callocN(MOC_RES*MOC_RES*MOC_RES*sizeof(void *), "sym table");
+ MeshOctree.table = MEM_callocN(MOC_RES * MOC_RES * MOC_RES * sizeof(void *), "sym table");
- if (em && me->edit_btmesh==em) {
+ if (em && me->edit_btmesh == em) {
BMVert *eve;
BMIter iter;
- BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL)
+ {
mesh_octree_add_nodes(MeshOctree.table, eve->co, MeshOctree.offs, MeshOctree.div, (intptr_t)(eve));
}
}
@@ -846,40 +851,40 @@ intptr_t mesh_octree_table(Object *ob, BMEditMesh *em, float *co, char mode)
MVert *mvert;
int a;
- for (a=0, mvert= me->mvert; a<me->totvert; a++, mvert++)
- mesh_octree_add_nodes(MeshOctree.table, mvert->co, MeshOctree.offs, MeshOctree.div, a+1);
+ for (a = 0, mvert = me->mvert; a < me->totvert; a++, mvert++)
+ mesh_octree_add_nodes(MeshOctree.table, mvert->co, MeshOctree.offs, MeshOctree.div, a + 1);
}
}
- else if (mode=='e') { /* end table */
+ else if (mode == 'e') { /* end table */
if (MeshOctree.table) {
int a;
- for (a=0, bt=MeshOctree.table; a<MOC_RES*MOC_RES*MOC_RES; a++, bt++) {
+ for (a = 0, bt = MeshOctree.table; a < MOC_RES * MOC_RES * MOC_RES; a++, bt++) {
if (*bt) mesh_octree_free_node(bt);
}
MEM_freeN(MeshOctree.table);
- MeshOctree.table= NULL;
+ MeshOctree.table = NULL;
}
}
return 0;
}
-MirrTopoStore_t mesh_topo_store= {NULL, -1. -1, -1};
+MirrTopoStore_t mesh_topo_store = {NULL, -1. - 1, -1};
/* mode is 's' start, or 'e' end, or 'u' use */
/* if end, ob can be NULL */
/* note, is supposed return -1 on error, which callers are currently checking for, but is not used so far */
int mesh_mirrtopo_table(Object *ob, char mode)
{
- if (mode=='u') { /* use table */
+ if (mode == 'u') { /* use table */
if (ED_mesh_mirrtopo_recalc_check(ob->data, ob->mode, &mesh_topo_store)) {
mesh_mirrtopo_table(ob, 's');
}
}
- else if (mode=='s') { /* start table */
+ else if (mode == 's') { /* start table */
ED_mesh_mirrtopo_init(ob->data, ob->mode, &mesh_topo_store, FALSE);
}
- else if (mode=='e') { /* end table */
+ else if (mode == 'e') { /* end table */
ED_mesh_mirrtopo_free(&mesh_topo_store);
}
return 0;
@@ -887,21 +892,21 @@ int mesh_mirrtopo_table(Object *ob, char mode)
static int mesh_get_x_mirror_vert_spacial(Object *ob, int index)
{
- Mesh *me= ob->data;
+ Mesh *me = ob->data;
MVert *mvert;
float vec[3];
- mvert= me->mvert+index;
- vec[0]= -mvert->co[0];
- vec[1]= mvert->co[1];
- vec[2]= mvert->co[2];
+ mvert = me->mvert + index;
+ vec[0] = -mvert->co[0];
+ vec[1] = mvert->co[1];
+ vec[2] = mvert->co[2];
return mesh_octree_table(ob, NULL, vec, 'u');
}
static int mesh_get_x_mirror_vert_topo(Object *ob, int index)
{
- if (mesh_mirrtopo_table(ob, 'u')==-1)
+ if (mesh_mirrtopo_table(ob, 'u') == -1)
return -1;
return mesh_topo_store.index_lookup[index];
@@ -925,16 +930,16 @@ static BMVert *editbmesh_get_x_mirror_vert_spacial(Object *ob, BMEditMesh *em, f
/* ignore nan verts */
if (!finite(co[0]) ||
- !finite(co[1]) ||
- !finite(co[2])
- )
+ !finite(co[1]) ||
+ !finite(co[2])
+ )
return NULL;
- vec[0]= -co[0];
- vec[1]= co[1];
- vec[2]= co[2];
+ vec[0] = -co[0];
+ vec[1] = co[1];
+ vec[2] = co[2];
- poinval= mesh_octree_table(ob, em, vec, 'u');
+ poinval = mesh_octree_table(ob, em, vec, 'u');
if (poinval != -1)
return (BMVert *)(poinval);
return NULL;
@@ -943,7 +948,7 @@ static BMVert *editbmesh_get_x_mirror_vert_spacial(Object *ob, BMEditMesh *em, f
static BMVert *editbmesh_get_x_mirror_vert_topo(Object *ob, struct BMEditMesh *em, BMVert *eve, int index)
{
intptr_t poinval;
- if (mesh_mirrtopo_table(ob, 'u')==-1)
+ if (mesh_mirrtopo_table(ob, 'u') == -1)
return NULL;
if (index == -1) {
@@ -951,7 +956,8 @@ static BMVert *editbmesh_get_x_mirror_vert_topo(Object *ob, struct BMEditMesh *e
BMVert *v;
index = 0;
- BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL)
+ {
if (v == eve)
break;
index++;
@@ -962,7 +968,7 @@ static BMVert *editbmesh_get_x_mirror_vert_topo(Object *ob, struct BMEditMesh *e
}
}
- poinval= mesh_topo_store.index_lookup[index];
+ poinval = mesh_topo_store.index_lookup[index];
if (poinval != -1)
return (BMVert *)(poinval);
@@ -989,22 +995,22 @@ static float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float
/* ignore nan verts */
if (isnan(uv[0]) || !finite(uv[0]) ||
- isnan(uv[1]) || !finite(uv[1])
- )
+ isnan(uv[1]) || !finite(uv[1])
+ )
return NULL;
if (axis) {
- vec[0]= uv[0];
- vec[1]= -((uv[1])-mirrCent[1]) + mirrCent[1];
+ vec[0] = uv[0];
+ vec[1] = -((uv[1]) - mirrCent[1]) + mirrCent[1];
cent_vec[0] = face_cent[0];
- cent_vec[1]= -((face_cent[1])-mirrCent[1]) + mirrCent[1];
+ cent_vec[1] = -((face_cent[1]) - mirrCent[1]) + mirrCent[1];
}
else {
- vec[0]= -((uv[0])-mirrCent[0]) + mirrCent[0];
- vec[1]= uv[1];
+ vec[0] = -((uv[0]) - mirrCent[0]) + mirrCent[0];
+ vec[1] = uv[1];
- cent_vec[0]= -((face_cent[0])-mirrCent[0]) + mirrCent[0];
+ cent_vec[0] = -((face_cent[0]) - mirrCent[0]) + mirrCent[0];
cent_vec[1] = face_cent[1];
}
@@ -1013,23 +1019,25 @@ static float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float
BMIter iter;
BMFace *efa;
- BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+ BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL)
+ {
poly_uv_center(em, efa, cent);
if ( (fabs(cent[0] - cent_vec[0]) < 0.001) && (fabs(cent[1] - cent_vec[1]) < 0.001) ) {
BMIter liter;
BMLoop *l;
- BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa)
+ {
MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
if ( (fabs(luv->uv[0] - vec[0]) < 0.001) && (fabs(luv->uv[1] - vec[1]) < 0.001) ) {
return luv->uv;
+ }
}
}
}
}
- }
return NULL;
}
@@ -1038,39 +1046,39 @@ static float *editmesh_get_mirror_uv(BMEditMesh *em, int axis, float *uv, float
static unsigned int mirror_facehash(const void *ptr)
{
- const MFace *mf= ptr;
+ const MFace *mf = ptr;
int v0, v1;
if (mf->v4) {
- v0= MIN4(mf->v1, mf->v2, mf->v3, mf->v4);
- v1= MAX4(mf->v1, mf->v2, mf->v3, mf->v4);
+ v0 = MIN4(mf->v1, mf->v2, mf->v3, mf->v4);
+ v1 = MAX4(mf->v1, mf->v2, mf->v3, mf->v4);
}
else {
- v0= MIN3(mf->v1, mf->v2, mf->v3);
- v1= MAX3(mf->v1, mf->v2, mf->v3);
+ v0 = MIN3(mf->v1, mf->v2, mf->v3);
+ v1 = MAX3(mf->v1, mf->v2, mf->v3);
}
- return ((v0*39)^(v1*31));
+ return ((v0 * 39) ^ (v1 * 31));
}
static int mirror_facerotation(MFace *a, MFace *b)
{
if (b->v4) {
- if (a->v1==b->v1 && a->v2==b->v2 && a->v3==b->v3 && a->v4==b->v4)
+ if (a->v1 == b->v1 && a->v2 == b->v2 && a->v3 == b->v3 && a->v4 == b->v4)
return 0;
- else if (a->v4==b->v1 && a->v1==b->v2 && a->v2==b->v3 && a->v3==b->v4)
+ else if (a->v4 == b->v1 && a->v1 == b->v2 && a->v2 == b->v3 && a->v3 == b->v4)
return 1;
- else if (a->v3==b->v1 && a->v4==b->v2 && a->v1==b->v3 && a->v2==b->v4)
+ else if (a->v3 == b->v1 && a->v4 == b->v2 && a->v1 == b->v3 && a->v2 == b->v4)
return 2;
- else if (a->v2==b->v1 && a->v3==b->v2 && a->v4==b->v3 && a->v1==b->v4)
+ else if (a->v2 == b->v1 && a->v3 == b->v2 && a->v4 == b->v3 && a->v1 == b->v4)
return 3;
}
else {
- if (a->v1==b->v1 && a->v2==b->v2 && a->v3==b->v3)
+ if (a->v1 == b->v1 && a->v2 == b->v2 && a->v3 == b->v3)
return 0;
- else if (a->v3==b->v1 && a->v1==b->v2 && a->v2==b->v3)
+ else if (a->v3 == b->v1 && a->v1 == b->v2 && a->v2 == b->v3)
return 1;
- else if (a->v2==b->v1 && a->v3==b->v2 && a->v1==b->v3)
+ else if (a->v2 == b->v1 && a->v3 == b->v2 && a->v1 == b->v3)
return 2;
}
@@ -1079,52 +1087,52 @@ static int mirror_facerotation(MFace *a, MFace *b)
static int mirror_facecmp(const void *a, const void *b)
{
- return (mirror_facerotation((MFace*)a, (MFace*)b) == -1);
+ return (mirror_facerotation((MFace *)a, (MFace *)b) == -1);
}
/* BMESH_TODO, convert to MPoly (functions above also) */
int *mesh_get_x_mirror_faces(Object *ob, BMEditMesh *em)
{
- Mesh *me= ob->data;
- MVert *mv, *mvert= me->mvert;
- MFace mirrormf, *mf, *hashmf, *mface= me->mface;
+ Mesh *me = ob->data;
+ MVert *mv, *mvert = me->mvert;
+ MFace mirrormf, *mf, *hashmf, *mface = me->mface;
GHash *fhash;
int *mirrorverts, *mirrorfaces;
int a;
- mirrorverts= MEM_callocN(sizeof(int)*me->totvert, "MirrorVerts");
- mirrorfaces= MEM_callocN(sizeof(int)*2*me->totface, "MirrorFaces");
+ mirrorverts = MEM_callocN(sizeof(int) * me->totvert, "MirrorVerts");
+ mirrorfaces = MEM_callocN(sizeof(int) * 2 * me->totface, "MirrorFaces");
mesh_octree_table(ob, em, NULL, 's');
- for (a=0, mv=mvert; a<me->totvert; a++, mv++)
- mirrorverts[a]= mesh_get_x_mirror_vert(ob, a);
+ for (a = 0, mv = mvert; a < me->totvert; a++, mv++)
+ mirrorverts[a] = mesh_get_x_mirror_vert(ob, a);
mesh_octree_table(ob, em, NULL, 'e');
- fhash= BLI_ghash_new(mirror_facehash, mirror_facecmp, "mirror_facehash gh");
- for (a=0, mf=mface; a<me->totface; a++, mf++)
+ fhash = BLI_ghash_new(mirror_facehash, mirror_facecmp, "mirror_facehash gh");
+ for (a = 0, mf = mface; a < me->totface; a++, mf++)
BLI_ghash_insert(fhash, mf, mf);
- for (a=0, mf=mface; a<me->totface; a++, mf++) {
- mirrormf.v1= mirrorverts[mf->v3];
- mirrormf.v2= mirrorverts[mf->v2];
- mirrormf.v3= mirrorverts[mf->v1];
- mirrormf.v4= (mf->v4)? mirrorverts[mf->v4]: 0;
+ for (a = 0, mf = mface; a < me->totface; a++, mf++) {
+ mirrormf.v1 = mirrorverts[mf->v3];
+ mirrormf.v2 = mirrorverts[mf->v2];
+ mirrormf.v3 = mirrorverts[mf->v1];
+ mirrormf.v4 = (mf->v4) ? mirrorverts[mf->v4] : 0;
/* make sure v4 is not 0 if a quad */
- if (mf->v4 && mirrormf.v4==0) {
+ if (mf->v4 && mirrormf.v4 == 0) {
SWAP(unsigned int, mirrormf.v1, mirrormf.v3);
SWAP(unsigned int, mirrormf.v2, mirrormf.v4);
}
- hashmf= BLI_ghash_lookup(fhash, &mirrormf);
+ hashmf = BLI_ghash_lookup(fhash, &mirrormf);
if (hashmf) {
- mirrorfaces[a*2]= hashmf - mface;
- mirrorfaces[a*2+1]= mirror_facerotation(&mirrormf, hashmf);
+ mirrorfaces[a * 2] = hashmf - mface;
+ mirrorfaces[a * 2 + 1] = mirror_facerotation(&mirrormf, hashmf);
}
else
- mirrorfaces[a*2]= -1;
+ mirrorfaces[a * 2] = -1;
}
BLI_ghash_free(fhash, NULL, NULL);