Revision: 42015
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42015
Author: ender79
Date: 2011-11-20 16:21:13 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
Various typo cleanups, remove unnecessary code etc, found during recent work
and separated to a cleanup change
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
branches/bmesh/blender/source/blender/bmesh/intern/in-progress/BME_conversions.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/bmesh/blender/source/blender/makesdna/intern/dna_genfile.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -1613,12 +1613,6 @@
CustomData_from_bmeshpoly(&bmdm->dm.faceData, &em->bm->pdata,
&em->bm->ldata, 0);
- bmdm->dm.numVertData = bm->totvert;
- bmdm->dm.numEdgeData = bm->totedge;
- bmdm->dm.numFaceData = em->tottri;
- bmdm->dm.numLoopData = bm->totloop;
- bmdm->dm.numPolyData = bm->totface;
-
bmdm->dm.getVertCos = bmDM_getVertCos;
bmdm->dm.getMinMax = bmDM_getMinMax;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -736,9 +736,9 @@
tex_space_mesh(me);
}
- if (loc_r) VECCOPY(loc_r, me->loc);
- if (rot_r) VECCOPY(rot_r, me->rot);
- if (size_r) VECCOPY(size_r, me->size);
+ if (loc_r) copy_v3_v3(loc_r, me->loc);
+ if (rot_r) copy_v3_v3(rot_r, me->rot);
+ if (size_r) copy_v3_v3(size_r, me->size);
}
float *get_mesh_orco_verts(Object *ob)
@@ -1118,7 +1118,7 @@
nors= dl->nors;
verts= dl->verts;
while(a--) {
- VECCOPY(mvert->co, verts);
+ copy_v3_v3(mvert->co, verts);
normal_float_to_short_v3(mvert->no, nors);
mvert++;
nors+= 3;
@@ -1231,7 +1231,7 @@
a= dl->parts*dl->nr;
data= dl->verts;
while(a--) {
- VECCOPY(mvert->co, data);
+ copy_v3_v3(mvert->co, data);
data+=3;
vertcount++;
mvert++;
@@ -1254,7 +1254,7 @@
a= dl->parts*dl->nr;
data= dl->verts;
while(a--) {
- VECCOPY(mvert->co, data);
+ copy_v3_v3(mvert->co, data);
data+=3;
vertcount++;
mvert++;
@@ -1277,7 +1277,7 @@
a= dl->nr;
data= dl->verts;
while(a--) {
- VECCOPY(mvert->co, data);
+ copy_v3_v3(mvert->co, data);
data+=3;
vertcount++;
mvert++;
@@ -1305,7 +1305,7 @@
a= dl->parts*dl->nr;
data= dl->verts;
while(a--) {
- VECCOPY(mvert->co, data);
+ copy_v3_v3(mvert->co, data);
data+=3;
vertcount++;
mvert++;
@@ -1767,7 +1767,7 @@
mf = mfaces;
for (i=0; i<numFaces; i++, mf++, origIndexFace++) {
if (*origIndexFace < numPolys) {
- VECCOPY(fnors[i], pnors[*origIndexFace]);
+ copy_v3_v3(fnors[i], pnors[*origIndexFace]);
} else {
/*eek, we're not corrusponding to polys*/
printf("error in mesh_calc_normals; tesselation
face indices are incorrect. normals may look bad.\n");
@@ -2448,7 +2448,7 @@
{
MVert *v1, *v2, *v3;
- double u[3], v[3], w[3];
+ double u[3], v[3], w[3];
double n[3] = {0.0, 0.0, 0.0}, l;
int i;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/object.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/object.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -2556,15 +2556,19 @@
BLI_assert((scene->customdata_mask &
CD_MASK_BAREMESH) == CD_MASK_BAREMESH);
if(em) {
makeDerivedMesh(scene, ob, em,
scene->customdata_mask, 0); /* was CD_MASK_BAREMESH */
- } else
+ }
+ else {
makeDerivedMesh(scene, ob,
NULL, scene->customdata_mask, 0);
+ }
#else /* ensure CD_MASK_BAREMESH for now */
BMEditMesh *em = (ob == scene->obedit)?
((Mesh*)ob->data)->edit_btmesh : NULL;
if(em) {
makeDerivedMesh(scene, ob, em,
scene->customdata_mask | CD_MASK_BAREMESH, 0); /* was CD_MASK_BAREMESH */
- } else
+ }
+ else {
makeDerivedMesh(scene, ob,
NULL, scene->customdata_mask | CD_MASK_BAREMESH, 0);
+ }
#endif
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -127,8 +127,9 @@
f = e->l->f;
f2 = e->l->radial_next->f;
- if (f != f2 && !BM_Join_TwoFaces(bm, f, f2, NULL))
+ if (f != f2 && !BM_Join_TwoFaces(bm, f, f2, e)) {
return 0;
+ }
return 1;
}
@@ -171,7 +172,7 @@
if (f != f2) {
/*join two remaining faces*/
- if (!BM_Join_TwoFaces(bm, f, f2, NULL)) {
+ if (!BM_Join_TwoFaces(bm, f, f2, e)) {
return 0;
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_newcore.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -1599,7 +1599,6 @@
the edges & faces and assign an index to each connected set
*/
while ((e = BLI_array_pop(stack))) {
BLI_ghash_insert(visithash, e,
SET_INT_IN_POINTER(maxindex));
- BM_SetIndex(e, maxindex); /* set_dirty! */ /*
BMESH_TODO, check the indexs are is invalid after this function runs */
BM_ITER(l, &liter, bm, BM_LOOPS_OF_EDGE, e) {
nl = (l->v == v) ? l->prev : l->next;
@@ -1611,7 +1610,6 @@
maxindex++;
}
- bm->elem_index_dirty |= BM_EDGE;
/* Make enough verts to split v for each group */
verts = MEM_callocN(sizeof(BMVert *) * maxindex, "bmesh_cutvert");
Modified:
branches/bmesh/blender/source/blender/bmesh/intern/in-progress/BME_conversions.c
===================================================================
---
branches/bmesh/blender/source/blender/bmesh/intern/in-progress/BME_conversions.c
2011-11-20 16:19:56 UTC (rev 42014)
+++
branches/bmesh/blender/source/blender/bmesh/intern/in-progress/BME_conversions.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -334,7 +334,7 @@
static void bmeshvert_to_mvert(BMMesh *bm, BMVert *v, MVert *mv, int index,
CustomData *data)
{
- copy_v3_v3(mv->co,v->co);
+ copy_v3_v3(mv->co, v->co);
if(bmesh_test_flag(v, BMESH_SELECT)) mv->flag |= 1;
if(bmesh_test_flag(v, BMESH_HIDDEN)) mv->flag |= ME_HIDE;
mv->bweight = (char)(255.0*v1->bweight);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -331,7 +331,7 @@
MLoopUV *mloopuv;
int i, j;
- for(i=0; i < numTex; i++){
+ for(i=0; i < numTex; i++) {
texface = CustomData_get_n(&me->fdata, CD_MTFACE, findex, i);
texpoly = CustomData_bmesh_get_n(&bm->pdata, f->head.data,
CD_MTEXPOLY, i);
Modified: branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/bmesh/tools/BME_bevel.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -85,13 +85,23 @@
vtd->bm = bm;
vtd->v = v;
- if (co != NULL) copy_v3_v3(vtd->co,co);
- if (org == NULL && is_new) { copy_v3_v3(vtd->org,v->co); } /* default */
- else if (org != NULL) copy_v3_v3(vtd->org,org);
+
+ if (co != NULL) {
+ copy_v3_v3(vtd->co, co);
+ }
+
+ if (org == NULL && is_new) {
+ copy_v3_v3(vtd->org, v->co); /* default */
+ }
+ else if (org != NULL) {
+ copy_v3_v3(vtd->org,org);
+ }
+
if (vec != NULL) {
copy_v3_v3(vtd->vec,vec);
normalize_v3(vtd->vec);
}
+
vtd->loc = loc;
vtd->factor = factor;
@@ -352,19 +362,19 @@
BME_TransData *vtd1, *vtd2;
float max, fac1, fac2, vec1[3], vec2[3], vec3[3];
- BME_bevel_get_vec(vec1,v1,v2,td);
- vtd1 = BME_get_transdata(td,v1);
- vtd2 = BME_get_transdata(td,v2);
+ BME_bevel_get_vec(vec1, v1, v2, td);
+ vtd1 = BME_get_transdata(td, v1);
+ vtd2 = BME_get_transdata(td, v2);
if (vtd1->loc == NULL) {
fac1 = 0;
}
else {
- copy_v3_v3(vec2,vtd1->vec);
- mul_v3_fl(vec2,vtd1->factor);
+ copy_v3_v3(vec2, vtd1->vec);
+ mul_v3_fl(vec2, vtd1->factor);
if (dot_v3v3(vec1, vec1)) {
- project_v3_v3v3(vec2,vec2,vec1);
- fac1 = len_v3(vec2)/value;
+ project_v3_v3v3(vec2, vec2,vec1);
+ fac1 = len_v3(vec2) / value;
}
else {
fac1 = 0;
@@ -375,11 +385,11 @@
fac2 = 0;
}
else {
- copy_v3_v3(vec3,vtd2->vec);
- mul_v3_fl(vec3,vtd2->factor);
+ copy_v3_v3(vec3, vtd2->vec);
+ mul_v3_fl(vec3, vtd2->factor);
if (dot_v3v3(vec1, vec1)) {
- project_v3_v3v3(vec2,vec3,vec1);
- fac2 = len_v3(vec2)/value;
+ project_v3_v3v3(vec2, vec3, vec1);
+ fac2 = len_v3(vec2) / value;
}
else {
fac2 = 0;
@@ -387,7 +397,7 @@
}
if (fac1 || fac2) {
- max = len_v3(vec1)/(fac1 + fac2);
+ max = len_v3(vec1) / (fac1 + fac2);
if (vtd1->max && (*vtd1->max < 0 || max < *vtd1->max)) {
*vtd1->max = max;
}
@@ -876,7 +886,7 @@
}
BMesh *BME_bevel(BMMesh *bm, float value, int res, int options, int
defgrp_index, float angle, BME_TransData_Head **rtd)
- {
+{
BMVert *v;
BMEdge *e;
BMIter *verts;
Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
2011-11-20 16:19:56 UTC (rev 42014)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
2011-11-20 16:21:13 UTC (rev 42015)
@@ -1871,9 +1871,7 @@
/* dependencies graph and notification stuff */
DAG_id_tag_update(ob->data, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-/* DAG_id_tag_update(ob->data, OB_RECALC_DATA);
- WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-*/
+
/* we succeeded */
return OPERATOR_FINISHED;
}
@@ -1897,9 +1895,7 @@
/* dependencies graph and notification stuff */
DAG_id_tag_update(ob->data, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-/* DAG_id_tag_update(ob->data, OB_RECALC_DATA);
- WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
-*/
+
/* we succeeded */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
