[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43928] branches/bmesh/blender/source/ blender/bmesh: Style Cleanup: edits for line length
Campbell Barton
ideasman42 at gmail.com
Mon Feb 6 07:27:11 CET 2012
Revision: 43928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43928
Author: campbellbarton
Date: 2012-02-06 06:26:54 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
Style Cleanup: edits for line length
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.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/bevel.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/createops.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
branches/bmesh/blender/source/blender/bmesh/operators/mirror.c
branches/bmesh/blender/source/blender/bmesh/tools/BME_weld.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-06 06:10:11 UTC (rev 43927)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h 2012-02-06 06:26:54 UTC (rev 43928)
@@ -286,22 +286,28 @@
/* puts every element of type type (which is a bitmask) with tool flag flag,
* into a slot. */
-void BMO_Flag_To_Slot(struct BMesh *bm, struct BMOperator *op, const char *slotname, const int flag, const char htype);
+void BMO_Flag_To_Slot(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const int flag, const char htype);
/* tool-flags all elements inside an element slot array with flag flag. */
-void BMO_Flag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname, const int hflag, const char htype);
+void BMO_Flag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const int hflag, const char htype);
/* clears tool-flag flag from all elements inside a slot array. */
-void BMO_Unflag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname, const int flag, const char htype);
+void BMO_Unflag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const int flag, const char htype);
/* tool-flags all elements inside an element slot array with flag flag. */
-void BMO_HeaderFlag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname, const char hflag, const char htype);
+void BMO_HeaderFlag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const char hflag, const char htype);
/* clears tool-flag flag from all elements inside a slot array. */
-void BMO_UnHeaderFlag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname, const char hflag, const char htype);
+void BMO_UnHeaderFlag_Buffer(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const char hflag, const char htype);
/* puts every element of type type (which is a bitmask) with header flag
* flag, into a slot. note: ignores hidden elements (e.g. elements with
* header flag BM_HIDDEN set).*/
-void BMO_HeaderFlag_To_Slot(struct BMesh *bm, struct BMOperator *op, const char *slotname, const char hflag, const char htype);
+void BMO_HeaderFlag_To_Slot(struct BMesh *bm, struct BMOperator *op, const char *slotname,
+ const char hflag, const char htype);
/* counts number of elements inside a slot array. */
int BMO_CountSlotBuf(struct BMesh *bm, struct BMOperator *op, const char *slotname);
@@ -405,7 +411,7 @@
/* use this for float mappings */
float BMO_IterMapValf(BMOIter *iter);
-#define BMO_ITER(ele, iter, bm, op, slotname, restrict) \
+#define BMO_ITER(ele, iter, bm, op, slotname, restrict) \
ele = BMO_IterNew(iter, bm, op, slotname, restrict); \
for ( ; ele; ele=BMO_IterStep(iter))
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-06 06:10:11 UTC (rev 43927)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-02-06 06:26:54 UTC (rev 43928)
@@ -398,42 +398,50 @@
}
}
-static void bm_copy_vert_attributes(BMesh *source_mesh, BMesh *target_mesh, const BMVert *source_vertex, BMVert *target_vertex)
+static void bm_copy_vert_attributes(BMesh *source_mesh, BMesh *target_mesh,
+ const BMVert *source_vertex, BMVert *target_vertex)
{
if ((source_mesh == target_mesh) && (source_vertex == target_vertex)) {
return;
}
copy_v3_v3(target_vertex->no, source_vertex->no);
CustomData_bmesh_free_block(&target_mesh->vdata, &target_vertex->head.data);
- CustomData_bmesh_copy_data(&source_mesh->vdata, &target_mesh->vdata, source_vertex->head.data, &target_vertex->head.data);
+ CustomData_bmesh_copy_data(&source_mesh->vdata, &target_mesh->vdata,
+ source_vertex->head.data, &target_vertex->head.data);
}
-static void bm_copy_edge_attributes(BMesh *source_mesh, BMesh *target_mesh, const BMEdge *source_edge, BMEdge *target_edge)
+static void bm_copy_edge_attributes(BMesh *source_mesh, BMesh *target_mesh,
+ const BMEdge *source_edge, BMEdge *target_edge)
{
if ((source_mesh == target_mesh) && (source_edge == target_edge)) {
return;
}
CustomData_bmesh_free_block(&target_mesh->edata, &target_edge->head.data);
- CustomData_bmesh_copy_data(&source_mesh->edata, &target_mesh->edata, source_edge->head.data, &target_edge->head.data);
+ CustomData_bmesh_copy_data(&source_mesh->edata, &target_mesh->edata,
+ source_edge->head.data, &target_edge->head.data);
}
-static void bm_copy_loop_attributes(BMesh *source_mesh, BMesh *target_mesh, const BMLoop *source_loop, BMLoop *target_loop)
+static void bm_copy_loop_attributes(BMesh *source_mesh, BMesh *target_mesh,
+ const BMLoop *source_loop, BMLoop *target_loop)
{
if ((source_mesh == target_mesh) && (source_loop == target_loop)) {
return;
}
CustomData_bmesh_free_block(&target_mesh->ldata, &target_loop->head.data);
- CustomData_bmesh_copy_data(&source_mesh->ldata, &target_mesh->ldata, source_loop->head.data, &target_loop->head.data);
+ CustomData_bmesh_copy_data(&source_mesh->ldata, &target_mesh->ldata,
+ source_loop->head.data, &target_loop->head.data);
}
-static void bm_copy_face_attributes(BMesh *source_mesh, BMesh *target_mesh, const BMFace *source_face, BMFace *target_face)
+static void bm_copy_face_attributes(BMesh *source_mesh, BMesh *target_mesh,
+ const BMFace *source_face, BMFace *target_face)
{
if ((source_mesh == target_mesh) && (source_face == target_face)) {
return;
}
copy_v3_v3(target_face->no, source_face->no);
CustomData_bmesh_free_block(&target_mesh->pdata, &target_face->head.data);
- CustomData_bmesh_copy_data(&source_mesh->pdata, &target_mesh->pdata, source_face->head.data, &target_face->head.data);
+ CustomData_bmesh_copy_data(&source_mesh->pdata, &target_mesh->pdata,
+ source_face->head.data, &target_face->head.data);
target_face->mat_nr = source_face->mat_nr;
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-06 06:10:11 UTC (rev 43927)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-06 06:26:54 UTC (rev 43928)
@@ -388,7 +388,8 @@
y
*/
-static int compute_mdisp_quad(BMLoop *l, double v1[3], double v2[3], double v3[3], double v4[3], double e1[3], double e2[3])
+static int compute_mdisp_quad(BMLoop *l, double v1[3], double v2[3], double v3[3], double v4[3],
+ double e1[3], double e2[3])
{
double cent[3] = {0.0, 0.0, 0.0}, n[3], p[3];
BMLoop *l2;
@@ -459,7 +460,8 @@
return f1;
}
-static int quad_co(double *x, double *y, double v1[3], double v2[3], double v3[3], double v4[3], double p[3], float n[3])
+static int quad_co(double *x, double *y, double v1[3], double v2[3], double v3[3], double v4[3],
+ double p[3], float n[3])
{
float projverts[5][3], n2[3];
double dprojverts[4][3], origin[3] = {0.0f, 0.0f, 0.0f};
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-06 06:10:11 UTC (rev 43927)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c 2012-02-06 06:26:54 UTC (rev 43928)
@@ -117,11 +117,17 @@
BMIter faces;
BMIter loops;
- for (v = BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm); v; v = BMIter_Step(&verts)) CustomData_bmesh_free_block(&(bm->vdata), &(v->head.data));
- for (e = BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BMIter_Step(&edges)) CustomData_bmesh_free_block(&(bm->edata), &(e->head.data));
+ for (v = BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm); v; v = BMIter_Step(&verts)) {
+ CustomData_bmesh_free_block(&(bm->vdata), &(v->head.data));
+ }
+ for (e = BMIter_New(&edges, bm, BM_EDGES_OF_MESH, bm); e; e = BMIter_Step(&edges)) {
+ CustomData_bmesh_free_block(&(bm->edata), &(e->head.data));
+ }
for (f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm); f; f = BMIter_Step(&faces)) {
CustomData_bmesh_free_block(&(bm->pdata), &(f->head.data));
- for (l = BMIter_New(&loops, bm, BM_LOOPS_OF_FACE, f); l; l = BMIter_Step(&loops)) CustomData_bmesh_free_block(&(bm->ldata), &(l->head.data));
+ for (l = BMIter_New(&loops, bm, BM_LOOPS_OF_FACE, f); l; l = BMIter_Step(&loops)) {
+ CustomData_bmesh_free_block(&(bm->ldata), &(l->head.data));
+ }
}
/* Free custom data pools, This should probably go in CustomData_free? */
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-06 06:10:11 UTC (rev 43927)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-06 06:26:54 UTC (rev 43928)
@@ -266,8 +266,9 @@
dest_slot->data.buf = NULL;
dest_slot->len = source_slot->len;
if (dest_slot->len) {
- dest_slot->data.buf = BLI_memarena_alloc(dest_op->arena, BMOP_OPSLOT_TYPEINFO[dest_slot->slottype] * dest_slot->len);
- memcpy(dest_slot->data.buf, source_slot->data.buf, BMOP_OPSLOT_TYPEINFO[dest_slot->slottype] * dest_slot->len);
+ const int slot_alloc_size = BMOP_OPSLOT_TYPEINFO[dest_slot->slottype] * dest_slot->len;
+ dest_slot->data.buf = BLI_memarena_alloc(dest_op->arena, slot_alloc_size);
+ memcpy(dest_slot->data.buf, source_slot->data.buf, slot_alloc_size);
}
}
else {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bevel.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list