Revision: 44081
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44081
Author: campbellbarton
Date: 2012-02-13 05:36:31 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
style cleanup > 120 line length.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_create.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_dupe.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_primitive.c
branches/bmesh/blender/source/blender/bmesh/operators/bmo_triangulate.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -560,7 +560,8 @@
mdisps->totdisp = md2->totdisp;
if (mdisps->totdisp) {
- mdisps->disps = MEM_callocN(sizeof(float) * 3 *
mdisps->totdisp, "mdisp->disps in bmesh_loop_intern_mdisps");
+ mdisps->disps = MEM_callocN(sizeof(float) * 3 *
mdisps->totdisp,
+ "mdisp->disps in
bmesh_loop_intern_mdisps");
}
else {
return;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -90,7 +90,10 @@
if (bm->selectmode & SCE_SELECT_VERTEX) {
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_MESH, bm); e; e =
BM_iter_step(&edges)) {
- if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) && !BM_elem_flag_test(e,
BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
+ BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+ !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+ {
BM_elem_flag_enable(e, BM_ELEM_SELECT);
}
else {
@@ -165,7 +168,10 @@
int ok;
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_MESH, bm); e; e =
BM_iter_step(&edges)) {
- if (!(BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) && !BM_elem_flag_test(e,
BM_ELEM_HIDDEN))) {
+ if (!(BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
+ BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+ !BM_elem_flag_test(e, BM_ELEM_HIDDEN)))
+ {
BM_elem_flag_disable(e, BM_ELEM_SELECT);
}
}
@@ -211,7 +217,10 @@
int ok;
for (e = BM_iter_new(&edges, bm, BM_EDGES_OF_MESH, bm); e; e =
BM_iter_step(&edges)) {
- if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
BM_elem_flag_test(e->v2, BM_ELEM_SELECT) && !BM_elem_flag_test(e,
BM_ELEM_HIDDEN)) {
+ if (BM_elem_flag_test(e->v1, BM_ELEM_SELECT) &&
+ BM_elem_flag_test(e->v2, BM_ELEM_SELECT) &&
+ !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
+ {
BM_elem_flag_enable(e, BM_ELEM_SELECT);
}
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -537,7 +537,8 @@
*
*/
-void BM_mesh_elem_index_validate(BMesh *bm, const char *location, const char
*func, const char *msg_a, const char *msg_b)
+void BM_mesh_elem_index_validate(BMesh *bm, const char *location, const char
*func,
+ const char *msg_a, const char *msg_b)
{
const char iter_types[3] = {BM_VERTS_OF_MESH,
BM_EDGES_OF_MESH,
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -506,6 +506,7 @@
{
BMOpSlot *slot = &op->slots[slotcode];
void *tmp;
+ ssize_t allocsize;
/* check if its actually a buffer */
if (!(slot->slottype > BMO_OP_SLOT_VEC))
@@ -515,9 +516,11 @@
if (slot->len >= slot->size) {
slot->size = (slot->size + 1 + totadd) * 2;
+ allocsize =
BMO_OPSLOT_TYPEINFO[opdefines[op->type]->slottypes[slotcode].type] * slot->size;
+
tmp = slot->data.buf;
- slot->data.buf =
MEM_callocN(BMO_OPSLOT_TYPEINFO[opdefines[op->type]->slottypes[slotcode].type]
* slot->size, "opslot dynamic array");
- memcpy(slot->data.buf, tmp,
BMO_OPSLOT_TYPEINFO[opdefines[op->type]->slottypes[slotcode].type] *
slot->size);
+ slot->data.buf = MEM_callocN(allocsize, "opslot dynamic
array");
+ memcpy(slot->data.buf, tmp, allocsize);
MEM_freeN(tmp);
}
@@ -527,9 +530,12 @@
slot->flag |= BMOS_DYNAMIC_ARRAY;
slot->len += totadd;
slot->size = slot->len + 2;
+
+ allocsize =
BMO_OPSLOT_TYPEINFO[opdefines[op->type]->slottypes[slotcode].type] * slot->len;
+
tmp = slot->data.buf;
- slot->data.buf =
MEM_callocN(BMO_OPSLOT_TYPEINFO[opdefines[op->type]->slottypes[slotcode].type]
* slot->len, "opslot dynamic array");
- memcpy(slot->data.buf, tmp,
BMO_OPSLOT_TYPEINFO[opdefines[op->type]->slottypes[slotcode].type] * slot->len);
+ slot->data.buf = MEM_callocN(allocsize, "opslot dynamic array");
+ memcpy(slot->data.buf, tmp, allocsize);
}
return slot->data.buf;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmo_bevel.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmo_bevel.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -360,7 +360,8 @@
if (!tag->newv) {
sub_v3_v3v3(co, l->prev->v->co,
l->v->co);
if (has_elens) {
- float elen = *(float
*)CustomData_bmesh_get_n(&bm->edata, l->prev->e->head.data, CD_PROP_FLT, li);
+ float elen = *(float
*)CustomData_bmesh_get_n(&bm->edata, l->prev->e->head.data,
+
CD_PROP_FLT, li);
normalize_v3(co);
mul_v3_fl(co, elen);
@@ -799,7 +800,10 @@
/* handle vertices along boundary edge */
BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
- if (BMO_elem_flag_test(bm, v, VERT_OLD) &&
BMO_elem_flag_test(bm, v, BEVEL_FLAG) && !BMO_elem_flag_test(bm, v, BEVEL_DEL))
{
+ if (BMO_elem_flag_test(bm, v, VERT_OLD) &&
+ BMO_elem_flag_test(bm, v, BEVEL_FLAG) &&
+ !BMO_elem_flag_test(bm, v, BEVEL_DEL))
+ {
BMLoop *l;
BMLoop *lorig = NULL;
BMIter liter;
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmo_create.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmo_create.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -1144,8 +1144,12 @@
count++;
}
- if (edges1 && BLI_array_count(edges1) > 2 &&
BM_edge_share_vert(edges1[0], edges1[BLI_array_count(edges1) - 1])) {
- if (edges2 && BLI_array_count(edges2) > 2 &&
BM_edge_share_vert(edges2[0], edges2[BLI_array_count(edges2) - 1])) {
+ if (edges1 && BLI_array_count(edges1) > 2 &&
+ BM_edge_share_vert(edges1[0], edges1[BLI_array_count(edges1) - 1]))
+ {
+ if (edges2 && BLI_array_count(edges2) > 2 &&
+ BM_edge_share_vert(edges2[0],
edges2[BLI_array_count(edges2) - 1]))
+ {
BLI_array_free(edges1);
BLI_array_free(edges2);
return;
@@ -1156,7 +1160,9 @@
}
}
- if (edges2 && BLI_array_count(edges2) > 2 &&
BM_edge_share_vert(edges2[0], edges2[BLI_array_count(edges2) - 1])) {
+ if (edges2 && BLI_array_count(edges2) > 2 &&
+ BM_edge_share_vert(edges2[0], edges2[BLI_array_count(edges2) - 1]))
+ {
edges2 = NULL;
}
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmo_dupe.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmo_dupe.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmo_dupe.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -203,7 +203,9 @@
ehash = BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp,
"bmesh dupeops e");
for (v = BM_iter_new(&verts, source, BM_VERTS_OF_MESH, source); v; v =
BM_iter_step(&verts)) {
- if (BMO_elem_flag_test(source, (BMHeader *)v, DUPE_INPUT) &&
(!BMO_elem_flag_test(source, (BMHeader *)v, DUPE_DONE))) {
+ if ( BMO_elem_flag_test(source, (BMHeader *)v, DUPE_INPUT) &&
+ !BMO_elem_flag_test(source, (BMHeader *)v, DUPE_DONE))
+ {
BMIter iter;
int iso = 1;
@@ -235,7 +237,9 @@
/* now we dupe all the edge */
for (e = BM_iter_new(&edges, source, BM_EDGES_OF_MESH, source); e; e =
BM_iter_step(&edges)) {
- if (BMO_elem_flag_test(source, (BMHeader *)e, DUPE_INPUT) &&
(!BMO_elem_flag_test(source, (BMHeader *)e, DUPE_DONE))) {
+ if ( BMO_elem_flag_test(source, (BMHeader *)e, DUPE_INPUT) &&
+ !BMO_elem_flag_test(source, (BMHeader *)e, DUPE_DONE))
+ {
/* make sure that verts are copie */
if (!BMO_elem_flag_test(source, (BMHeader *)e->v1,
DUPE_DONE)) {
copy_vertex(source, e->v1, target, vhash);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -760,7 +760,9 @@
currkey->totelem = bm->totvert;
BM_ITER(eve, &iter, bm,
BM_VERTS_OF_MESH, NULL) {
- co = currkey == actkey ?
eve->co : CustomData_bmesh_get_n(&bm->vdata, eve->head.data, CD_SHAPEKEY, j);
+ co = (currkey == actkey) ?
+ eve->co :
+
CustomData_bmesh_get_n(&bm->vdata, eve->head.data, CD_SHAPEKEY, j);
copy_v3_v3(fp, co);
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmo_primitive.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmo_primitive.c
2012-02-13 04:52:41 UTC (rev 44080)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmo_primitive.c
2012-02-13 05:36:31 UTC (rev 44081)
@@ -451,7 +451,10 @@
tv[i] = BM_vert_create(bm, v, NULL);
BMO_elem_flag_enable(bm, tv[i], VERT_MARK);
- tv[monkeynv + i] = (fabsf(v[0] = -v[0]) < 0.001f) ? tv[i]: (eve
= BM_vert_create(bm, v, NULL), mul_m4_v3(mat, eve->co), eve);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
