[Bf-blender-cvs] [62aa004] master: Style Cleanup: whitespace
Campbell Barton
noreply at git.blender.org
Sun Jan 12 12:06:14 CET 2014
Commit: 62aa004c25572fceb44ffdff37dd20119b81ca02
Author: Campbell Barton
Date: Sun Jan 12 22:05:24 2014 +1100
https://developer.blender.org/rB62aa004c25572fceb44ffdff37dd20119b81ca02
Style Cleanup: whitespace
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/tracking_private.h
M source/blender/blenlib/intern/string_utf8.c
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_walkers_impl.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/bmesh/tools/bmesh_bisect_plane.c
M source/blender/bmesh/tools/bmesh_edgenet.c
M source/blender/bmesh/tools/bmesh_edgesplit.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/mesh/mesh_data.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/sculpt_paint/paint_cursor.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_node/node_select.c
M source/blender/editors/transform/transform.c
M source/blender/editors/util/undo.c
M source/blender/imbuf/intern/cineon/dpxlib.c
M source/blender/makesrna/intern/rna_tracking.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/python/bmesh/bmesh_py_ops_call.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 8796bd5..ee7d890 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -1571,7 +1571,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
continue;
}
if (sculpt_mode &&
- (!has_multires || multires_applied || ob->sculpt->bm))
+ (!has_multires || multires_applied || ob->sculpt->bm))
{
int unsupported = 0;
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 32914de..712f79c 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -429,7 +429,7 @@ static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges
int i;
if (cddm->pbvh && cddm->pbvh_draw &&
- BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH)
+ BKE_pbvh_type(cddm->pbvh) == PBVH_BMESH)
{
BKE_pbvh_draw(cddm->pbvh, NULL, NULL, NULL, TRUE);
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index ce42d6a..546c3f9 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -350,8 +350,8 @@ static int layer_bucket_isect_test(MaskRasterLayer *layer, unsigned int face_ind
}
else {
if ((dist_squared_to_line_segment_v2(cent, v1, v2) < bucket_max_rad_squared) ||
- (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
- (dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared))
+ (dist_squared_to_line_segment_v2(cent, v2, v3) < bucket_max_rad_squared) ||
+ (dist_squared_to_line_segment_v2(cent, v3, v1) < bucket_max_rad_squared))
{
return TRUE;
}
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 694c835..b2738f5 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -1997,7 +1997,7 @@ int BKE_mesh_mselect_find(Mesh *me, int index, int type)
for (i = 0; i < me->totselect; i++) {
if ((me->mselect[i].index == index) &&
- (me->mselect[i].type == type))
+ (me->mselect[i].type == type))
{
return i;
}
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index bfde9a9..3596ad9 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -605,7 +605,7 @@ static void long_edge_queue_create(EdgeQueueContext *eq_ctx,
/* Check leaf nodes marked for topology update */
if ((node->flag & PBVH_Leaf) &&
- (node->flag & PBVH_UpdateTopology))
+ (node->flag & PBVH_UpdateTopology))
{
GHashIterator gh_iter;
@@ -644,7 +644,7 @@ static void short_edge_queue_create(EdgeQueueContext *eq_ctx,
/* Check leaf nodes marked for topology update */
if ((node->flag & PBVH_Leaf) &&
- (node->flag & PBVH_UpdateTopology))
+ (node->flag & PBVH_UpdateTopology))
{
GHashIterator gh_iter;
@@ -747,7 +747,7 @@ static void pbvh_bmesh_split_edge(EdgeQueueContext *eq_ctx, PBVH *bvh,
/* Ensure new vertex is in the node */
if (!BLI_gset_haskey(bvh->nodes[ni].bm_unique_verts, v_new) &&
- !BLI_gset_haskey(bvh->nodes[ni].bm_other_verts, v_new))
+ !BLI_gset_haskey(bvh->nodes[ni].bm_other_verts, v_new))
{
BLI_gset_insert(bvh->nodes[ni].bm_other_verts, v_new);
}
@@ -788,7 +788,7 @@ static int pbvh_bmesh_subdivide_long_edges(EdgeQueueContext *eq_ctx, PBVH *bvh,
* and the node has been split, thus leaving wire edges and
* associated vertices. */
if (!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v1) ||
- !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
+ !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
{
continue;
}
@@ -974,7 +974,7 @@ static int pbvh_bmesh_collapse_short_edges(EdgeQueueContext *eq_ctx,
* and the node has been split, thus leaving wire edges and
* associated vertices. */
if (!BLI_ghash_haskey(bvh->bm_vert_to_node, e->v1) ||
- !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
+ !BLI_ghash_haskey(bvh->bm_vert_to_node, e->v2))
{
continue;
}
@@ -1145,7 +1145,7 @@ int BKE_pbvh_bmesh_update_topology(PBVH *bvh, PBVHTopologyUpdateMode mode,
PBVHNode *node = &bvh->nodes[n];
if (node->flag & PBVH_Leaf &&
- node->flag & PBVH_UpdateTopology)
+ node->flag & PBVH_UpdateTopology)
{
node->flag &= ~PBVH_UpdateTopology;
}
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 188c80e..2d23c32 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -142,8 +142,7 @@ static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels,
ccgSubSurf_getUseAgeCounts(prevSS, &oldUseAging, NULL, NULL, NULL);
if ((oldUseAging != useAging) ||
- (ccgSubSurf_getSimpleSubdiv(prevSS) !=
- !!(flags & CCG_SIMPLE_SUBDIV)))
+ (ccgSubSurf_getSimpleSubdiv(prevSS) != !!(flags & CCG_SIMPLE_SUBDIV)))
{
ccgSubSurf_free(prevSS);
}
diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h
index 9d6c901..3245fe5 100644
--- a/source/blender/blenkernel/tracking_private.h
+++ b/source/blender/blenkernel/tracking_private.h
@@ -32,8 +32,8 @@
* by multiple tracking files but which should not be public.
*/
-#ifndef __TRACKING_PRIVATE__
-#define __TRACKING_PRIVATE__
+#ifndef __TRACKING_PRIVATE_H__
+#define __TRACKING_PRIVATE_H__
struct GHash;
struct MovieTracking;
@@ -81,4 +81,4 @@ void tracking_set_marker_coords_from_tracking(int frame_width, int frame_height,
void tracking_marker_insert_disabled(struct MovieTrackingTrack *track, const struct MovieTrackingMarker *ref_marker,
bool before, bool overwrite);
-#endif /* __TRACKING_PRIVATE__ */
+#endif /* __TRACKING_PRIVATE_H__ */
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index e565d6e..e7beaaa 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -115,7 +115,7 @@ int BLI_utf8_invalid_byte(const char *str, int length)
* and then for 1111 1100, xx00 00xx */
case 5:
if (c == 0xfe || c == 0xff ||
- (c == 0xfc && (*p & 0x3c) == 0)) goto utf8_error;
+ (c == 0xfc && (*p & 0x3c) == 0)) goto utf8_error;
break;
}
diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c
index 0a6c0f4..2f05d90 100644
--- a/source/blender/bmesh/intern/bmesh_marking.c
+++ b/source/blender/bmesh/intern/bmesh_marking.c
@@ -167,8 +167,8 @@ void BM_mesh_select_mode_flush_ex(BMesh *bm, const short selectmode)
{
BM_ITER_MESH (e, &eiter, bm, BM_EDGES_OF_MESH) {
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_test(e->v2, BM_ELEM_SELECT) &&
+ !BM_elem_flag_test(e, BM_ELEM_HIDDEN))
{
BM_elem_flag_enable(e, BM_ELEM_SELECT);
}
diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c
index aca2f96..4cf252e 100644
--- a/source/blender/bmesh/intern/bmesh_walkers_impl.c
+++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c
@@ -641,12 +641,12 @@ static void *bmw_LoopWalker_step(BMWalker *walker)
/* check if we should step, this is fairly involved */
if (
- /* walk over boundary of faces but stop at corners */
- (owalk.is_single == false && vert_edge_tot > 2) ||
+ /* walk over boundary of faces but stop at corners */
+ (owalk.is_single == false && vert_edge_tot > 2) ||
- /* initial edge was a boundary, so is this edge and vertex is only apart of this face
- * this lets us walk over the the boundary of an ngon which is handy */
- (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
+ /* initial edge was a boundary, so is this edge and vertex is only apart of this face
+ * this lets us walk over the the boundary of an ngon which is handy */
+ (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e)))
{
/* find next boundary edge in the fan */
do {
@@ -932,7 +932,7 @@ static void *bmw_EdgeringWalker_step(BMWalker *walker)
}
if ((len <= 0) || (len % 2 != 0) || !EDGE_CHECK(l->e) ||
- !bmw_mask_check_face(walker, l->f))
+ !bmw_mask_check_face(walker, l->f))
{
l = owalk.l;
i = len;
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 0024e17..71bb583 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -2436,7 +2436,7 @@ static bool tri_corner_test(BevelParams *bp, BevVert *bv)
totang += ang;
}
angdiff = fabsf(totang - 3.0f * (float)M_PI_2);
- if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI/16.0f) ||
+ if ((bp->pro_super_r == PRO_SQUARE_R && angdiff > (float)M_PI / 16.0f) ||
(angdiff > (float)M_PI_4))
{
return false;
diff --git a/source/blender/bmesh/tools/bmesh_bisect_plane.c b/source/blender/bmesh/tools/bmesh_bisect_plane.c
index 7001cfa..7a33dc4 100644
--- a/source/blender/bmesh/tools/bmesh_bisect_plane.c
+++ b/source/blender/bmesh/tools/bmesh_bisect_plane.c
@@ -248,7 +248,7 @@ static void bm_face_bisect_verts(BMesh *bm, BMFace *f, const float plane[4], con
/* would be nice to avoid loop lookup here,
* but we need to know which face the verts are in */
if ((l_a = BM_face_vert_share_loop(face_split_arr[j], v_a)) &&
- (l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
+ (l_b = BM_face_vert_share_loop(face_split_arr[j], v_b)))
{
found = true;
break;
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c
index 14d474f..3b70d0e 100644
--- a/source/blender
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list