[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44474] trunk/blender/source/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Feb 26 23:38:56 CET 2012
Revision: 44474
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44474
Author: campbellbarton
Date: 2012-02-26 22:38:49 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/bmesh.h
trunk/blender/source/blender/bmesh/bmesh_iterators.h
trunk/blender/source/blender/bmesh/bmesh_walkers.h
trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_operator_api_inline.c
trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/operators/bmo_edgesplit.c
trunk/blender/source/blender/bmesh/operators/bmo_mesh_conv.c
trunk/blender/source/blender/bmesh/operators/bmo_primitive.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/mesh/bmesh_select.c
trunk/blender/source/blender/editors/mesh/bmesh_tools.c
trunk/blender/source/blender/editors/mesh/knifetool.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.h
Modified: trunk/blender/source/blender/bmesh/bmesh.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh.h 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/bmesh.h 2012-02-26 22:38:49 UTC (rev 44474)
@@ -106,12 +106,12 @@
/* we have 3 spare flags which is awesome but since we're limited to 8
* only add new flags with care! - campbell */
-/* #define BM_ELEM_SPARE (1<<5) */
-/* #define BM_ELEM_SPARE (1<<6) */
+/* #define BM_ELEM_SPARE (1 << 5) */
+/* #define BM_ELEM_SPARE (1 << 6) */
-#define BM_ELEM_INTERNAL_TAG (1<<7) /* for low level internal API tagging,
- * since tools may want to tag verts and
- * not have functions clobber them */
+#define BM_ELEM_INTERNAL_TAG (1 << 7) /* for low level internal API tagging,
+ * since tools may want to tag verts and
+ * not have functions clobber them */
/* Mesh Level Ops */
extern int bm_mesh_allocsize_default[4];
Modified: trunk/blender/source/blender/bmesh/bmesh_iterators.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/bmesh_iterators.h 2012-02-26 22:38:49 UTC (rev 44474)
@@ -84,11 +84,11 @@
#define BM_ITER(ele, iter, bm, itype, data) \
ele = BM_iter_new(iter, bm, itype, data); \
- for ( ; ele; ele=BM_iter_step(iter))
+ for ( ; ele; ele = BM_iter_step(iter))
#define BM_ITER_INDEX(ele, iter, bm, itype, data, indexvar) \
ele = BM_iter_new(iter, bm, itype, data); \
- for (indexvar=0; ele; indexvar++, ele=BM_iter_step(iter))
+ for (indexvar = 0; ele; indexvar++, ele = BM_iter_step(iter))
/*Iterator Structure*/
typedef struct BMIter {
Modified: trunk/blender/source/blender/bmesh/bmesh_walkers.h
===================================================================
--- trunk/blender/source/blender/bmesh/bmesh_walkers.h 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/bmesh_walkers.h 2012-02-26 22:38:49 UTC (rev 44474)
@@ -91,7 +91,7 @@
BMW_init(&walker, bm, BMW_ISLAND, SOME_OP_FLAG);
f = BMW_begin(&walker, some_start_face);
-for (; f; f=BMW_step(&walker))
+for (; f; f = BMW_step(&walker))
{
//do something with f
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c 2012-02-26 22:38:49 UTC (rev 44474)
@@ -288,14 +288,14 @@
y = aa[a1] * dd[a2] + bb[a1] * cc[a2] - cc[a1] * bb[a2] - dd[a1] * aa[a2];
z = bb[a1] * dd[a2] - dd[a1] * bb[a2];
- if (fabs(2 * (x - y + z)) > FLT_EPSILON * 10.0f) {
+ if (fabsf(2.0f * (x - y + z)) > FLT_EPSILON * 10.0f) {
float f2;
f1 = (sqrt(y * y - 4.0 * x * z) - y + 2.0 * z) / (2.0 * (x - y + z));
f2 = (-sqrt(y * y - 4.0 * x * z) - y + 2.0 * z) / (2.0 * (x - y + z));
- f1 = fabs(f1);
- f2 = fabs(f2);
+ f1 = fabsf(f1);
+ f2 = fabsf(f2);
f1 = MIN2(f1, f2);
CLAMP(f1, 0.0f, 1.0f + FLT_EPSILON);
}
@@ -308,9 +308,9 @@
for (i = 0; i < 2; i++) {
if (fabsf(aa[i]) < FLT_EPSILON * 100.0f)
- return aa[(i + 1) % 2] / fabs(bb[(i + 1) % 2] - aa[(i + 1) % 2]);
+ return aa[(i + 1) % 2] / fabsf(bb[(i + 1) % 2] - aa[(i + 1) % 2]);
if (fabsf(cc[i]) < FLT_EPSILON * 100.0f)
- return cc[(i + 1) % 2] / fabs(dd[(i + 1) % 2] - cc[(i + 1) % 2]);
+ return cc[(i + 1) % 2] / fabsf(dd[(i + 1) % 2] - cc[(i + 1) % 2]);
}
}
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c 2012-02-26 22:38:49 UTC (rev 44474)
@@ -782,7 +782,7 @@
return nl->e;
}
-BMVert *BM_vert_rip ( BMesh *bm, BMFace *sf, BMVert *sv)
+BMVert *BM_vert_rip(BMesh *bm, BMFace *sf, BMVert *sv)
{
return bmesh_urmv(bm, sf, sv);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operator_api_inline.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operator_api_inline.c 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operator_api_inline.c 2012-02-26 22:38:49 UTC (rev 44474)
@@ -40,31 +40,31 @@
* if you need to store a value per element, use a
* ghash or a mapping slot to do it. */
-/* flags 15 and 16 (1<<14 and 1<<15) are reserved for bmesh api use */
+/* flags 15 and 16 (1 << 14 and 1 << 15) are reserved for bmesh api use */
BM_INLINE short _bmo_elem_flag_test(BMesh *bm, BMFlagLayer *oflags, const short oflag)
{
- return oflags[bm->stackdepth-1].f & oflag;
+ return oflags[bm->stackdepth - 1].f & oflag;
}
BM_INLINE void _bmo_elem_flag_enable(BMesh *bm, BMFlagLayer *oflags, const short oflag)
{
- oflags[bm->stackdepth-1].f |= oflag;
+ oflags[bm->stackdepth - 1].f |= oflag;
}
BM_INLINE void _bmo_elem_flag_disable(BMesh *bm, BMFlagLayer *oflags, const short oflag)
{
- oflags[bm->stackdepth-1].f &= ~oflag;
+ oflags[bm->stackdepth - 1].f &= ~oflag;
}
BM_INLINE void _bmo_elem_flag_set(BMesh *bm, BMFlagLayer *oflags, const short oflag, int val)
{
- if (val) oflags[bm->stackdepth-1].f |= oflag;
- else oflags[bm->stackdepth-1].f &= ~oflag;
+ if (val) oflags[bm->stackdepth - 1].f |= oflag;
+ else oflags[bm->stackdepth - 1].f &= ~oflag;
}
BM_INLINE void _bmo_elem_flag_toggle(BMesh *bm, BMFlagLayer *oflags, const short oflag)
{
- oflags[bm->stackdepth-1].f ^= oflag;
+ oflags[bm->stackdepth - 1].f ^= oflag;
}
BM_INLINE void BMO_slot_map_int_insert(BMesh *bm, BMOperator *op, const char *slotname,
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c 2012-02-26 22:38:49 UTC (rev 44474)
@@ -943,7 +943,7 @@
bm->totflags++;
/* allocate new flag poo */
- bm->toolflagpool = newpool = BLI_mempool_create(sizeof(BMFlagLayer)*bm->totflags, 512, 512, FALSE, FALSE);
+ bm->toolflagpool = newpool = BLI_mempool_create(sizeof(BMFlagLayer) * bm->totflags, 512, 512, FALSE, FALSE);
/* now go through and memcpy all the flags. Loops don't get a flag layer at this time.. */
for (ele = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, bm), i = 0; ele; ele = BM_iter_step(&iter), i++) {
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-02-26 22:38:49 UTC (rev 44474)
@@ -740,8 +740,8 @@
//if (linecrosses(pv1, pv2, v1, v3)) return FALSE;
- if ( point_in_triangle(v1, v2, v3, pv1) ||
- point_in_triangle(v3, v2, v1, pv1))
+ if (point_in_triangle(v1, v2, v3, pv1) ||
+ point_in_triangle(v3, v2, v1, pv1))
{
return FALSE;
}
@@ -784,8 +784,9 @@
if (isear) {
#if 0
+ /* if this code comes back, it needs to be converted to radians */
angle = angle_v3v3v3(verts[v1->head.eflag2], verts[v2->head.eflag2], verts[v3->head.eflag2]);
- if (!bestear || ABS(angle-45.0f) < bestangle) {
+ if (!bestear || ABS(angle - 45.0f) < bestangle) {
bestear = l;
bestangle = ABS(45.0f - angle);
}
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_queries.c 2012-02-26 22:38:49 UTC (rev 44474)
@@ -547,10 +547,10 @@
void BM_edge_ordered_verts(BMEdge *edge, BMVert **r_v1, BMVert **r_v2)
{
- if ( (edge->l == NULL) ||
- ( ((edge->l->prev->v == edge->v1) && (edge->l->v == edge->v2)) ||
- ((edge->l->v == edge->v1) && (edge->l->next->v == edge->v2)) )
- )
+ if ((edge->l == NULL) ||
+ (((edge->l->prev->v == edge->v1) && (edge->l->v == edge->v2)) ||
+ ((edge->l->v == edge->v1) && (edge->l->next->v == edge->v2)))
+ )
{
*r_v1 = edge->v1;
*r_v2 = edge->v2;
@@ -801,7 +801,7 @@
/* first check if verts have edges, if not we can bail out early */
ok = TRUE;
- for (i = len - 1, i_next = 0; i_next < len; (i=i_next++)) {
+ for (i = len - 1, i_next = 0; i_next < len; (i = i_next++)) {
if (!(varr[i] = BM_edge_share_vert(earr[i], earr[i_next]))) {
ok = FALSE;
break;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-02-26 22:18:16 UTC (rev 44473)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-02-26 22:38:49 UTC (rev 44474)
@@ -880,8 +880,8 @@
if (!bm->totvert || !bm->totedge)
return;
- edata = MEM_callocN(sizeof(EdgeData)*bm->totedge, "EdgeData");
- vdata = MEM_callocN(sizeof(VertData)*bm->totvert, "VertData");
+ edata = MEM_callocN(sizeof(EdgeData) * bm->totedge, "EdgeData");
+ vdata = MEM_callocN(sizeof(VertData) * bm->totvert, "VertData");
BMO_slot_buffer_flag_enable(bm, op, "edges", EDGE_MARK, BM_EDGE);
BMO_slot_buffer_flag_enable(bm, op, "excludefaces", FACE_IGNORE, BM_FACE);
@@ -1050,9 +1050,9 @@
for (i = 0; i < 2; i++) {
BM_ITER(e2, &iter, bm, BM_EDGES_OF_VERT, i ? e->v2 : e->v1) {
- if ( (BMO_elem_flag_test(bm, e2, EDGE_MARK)) &&
- (!BMO_elem_flag_test(bm, e2, EDGE_VIS)) &&
- (e2 != e))
+ if ((BMO_elem_flag_test(bm, e2, EDGE_MARK)) &&
+ (!BMO_elem_flag_test(bm, e2, EDGE_VIS)) &&
+ (e2 != e))
{
return e2;
}
@@ -1101,8 +1101,8 @@
while (1) {
BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) {
if (!BMO_elem_flag_test(bm, e, EDGE_VIS)) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list