From dc98a3b0a74b0e91ad424195ce488a9b14f13e73 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 12 Dec 2015 15:10:03 +1100 Subject: Cleanup: style/spelling --- source/blender/blenkernel/intern/pbvh_bmesh.c | 4 ++-- source/blender/blenlib/intern/task.c | 2 +- source/blender/bmesh/operators/bmo_primitive.c | 4 ++-- source/blender/bmesh/tools/bmesh_intersect.c | 7 ++++--- source/blender/editors/space_outliner/outliner_tools.c | 4 ++-- source/blender/editors/space_view3d/drawmesh.c | 8 ++++---- source/blender/modifiers/intern/MOD_boolean.c | 3 ++- 7 files changed, 17 insertions(+), 15 deletions(-) diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 93aa10782c4..88dc63d6cb2 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -785,8 +785,8 @@ static void long_edge_queue_face_add( const float len_sq = BM_edge_calc_length_squared(l_iter->e); if (len_sq > eq_ctx->q->limit_len_squared) { long_edge_queue_edge_add_recursive( - eq_ctx, l_iter->radial_next, l_iter, - len_sq, eq_ctx->q->limit_len); + eq_ctx, l_iter->radial_next, l_iter, + len_sq, eq_ctx->q->limit_len); } #else long_edge_queue_edge_add(eq_ctx, l_iter->e); diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index e3d13b4ada4..515da9cd95d 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -646,7 +646,7 @@ static void parallel_range_func( * \param range_threshold Minimum size of processed range to start using tasks * (below this, loop is done in main thread only). * \param use_dynamic_scheduling If \a true, the whole range is divided in a lot of small chunks (of size 32 currently), - * otehrwise whole range is split in a few big chunks (num_threads * 2 chunks currently). + * otherwise whole range is split in a few big chunks (num_threads * 2 chunks currently). */ void BLI_task_parallel_range_ex( int start, int stop, diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c index 0ce645f80a7..33681c992a0 100644 --- a/source/blender/bmesh/operators/bmo_primitive.c +++ b/source/blender/bmesh/operators/bmo_primitive.c @@ -933,8 +933,8 @@ void bmo_create_cone_exec(BMesh *bm, BMOperator *op) * * \param bm The BMesh to operate on. * \param mat The transform matrix applied to the created cone/cylinder. - * \param radius_top The size of the top end of the cone/cylynder. - * \param radius_bottom The size of the bottom end of the cone/cylynder. + * \param radius_top The size of the top end of the cone/cylinder. + * \param radius_bottom The size of the bottom end of the cone/cylinder. * \param segments The number of subdivisions in the sides of the cone/cylinder. * \param cap_ends Whether the ends of the cone/cylinder are filled or not. * \param oflag The flag to check faces with. diff --git a/source/blender/bmesh/tools/bmesh_intersect.c b/source/blender/bmesh/tools/bmesh_intersect.c index d2ab2e4eb6a..80b1780758d 100644 --- a/source/blender/bmesh/tools/bmesh_intersect.c +++ b/source/blender/bmesh/tools/bmesh_intersect.c @@ -859,10 +859,11 @@ static void raycast_callback(void *userdata, if ( #ifdef USE_KDOPBVH_WATERTIGHT - isect_ray_tri_watertight_v3(ray->origin, &isect_precalc_x, v0, v1, v2, &dist, NULL)) + isect_ray_tri_watertight_v3(ray->origin, &isect_precalc_x, v0, v1, v2, &dist, NULL) #else - isect_ray_tri_epsilon_v3(ray->origin, ray->direction, v0, v1, v2, &dist, NULL, FLT_EPSILON)) + isect_ray_tri_epsilon_v3(ray->origin, ray->direction, v0, v1, v2, &dist, NULL, FLT_EPSILON) #endif + ) { if (dist >= 0.0f) { #ifdef USE_DUMP @@ -1516,7 +1517,7 @@ bool BM_mesh_intersect( #endif /* USE_SEPARATE */ if ((boolean_mode != BMESH_ISECT_BOOLEAN_NONE)) { - BVHTree *tree_pair[2] = {tree_a, tree_b}; + BVHTree *tree_pair[2] = {tree_a, tree_b}; /* group vars */ int *groups_array; diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index dd0b29c9548..e4471acc2c8 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1292,8 +1292,8 @@ static int outliner_lib_operation_exec(bContext *C, wmOperator *op) outliner_do_libdata_operation(C, scene, soops, &soops->tree, lib_delete_cb); WM_event_add_notifier(C, NC_ID | NA_EDITED, NULL); - /* Note: no undo possible here really, not 100% sure why... Probably because of library optimisations - * in undo/redo process? */ + /* Note: no undo possible here really, not 100% sure why... + * Probably because of library optimizations in undo/redo process? */ /* ED_undo_push(C, "Rename"); */ break; } diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index f6e66ca5e90..5c8c1a42389 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -1174,14 +1174,14 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, if (glsl || picking) { /* draw glsl or solid */ dm->drawMappedFacesMat(dm, - tex_mat_set_material_cb, - set_face_cb, &data); + tex_mat_set_material_cb, + set_face_cb, &data); } else { /* draw textured */ dm->drawMappedFacesMat(dm, - tex_mat_set_texture_cb, - set_face_cb, &data); + tex_mat_set_texture_cb, + set_face_cb, &data); } GPU_end_object_materials(); diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 8379d2823af..57318e44eec 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -201,7 +201,8 @@ static DerivedMesh *applyModifier_bmesh( DM_to_bmesh_ex(dm_other, bm, true); DM_to_bmesh_ex(dm, bm, true); - if (1) { + /* main bmesh intersection setup */ + { /* create tessface & intersect */ const int looptris_tot = poly_to_tri_count(bm->totface, bm->totloop); int tottri; -- cgit v1.2.3