diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-07-15 04:43:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-15 04:43:23 +0300 |
commit | 52fa5b12e10354adbb3541c0e9106620fe16d2fc (patch) | |
tree | 677d1babb2141eb965873acb4c69795e45a06979 /source/blender/blenkernel | |
parent | f2620c9df134ac580569044d1fae1d6da3cc5fbc (diff) |
Cleanup: ws
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_remap.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 10 |
3 files changed, 14 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 0df2c40f248..9838d1d96f1 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1682,10 +1682,11 @@ static void cdDM_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int *UNUSED( } } -static void cdDM_copy_gpu_data(DerivedMesh *dm, int type, float *varray, - int *mat_orig_to_new, void *user_data) +static void cdDM_copy_gpu_data( + DerivedMesh *dm, int type, float *varray, + int *mat_orig_to_new, void *user_data) { - switch(type) { + switch (type) { case GPU_BUFFER_VERTEX: cdDM_buffer_copy_vertex(dm, varray, mat_orig_to_new, user_data); break; diff --git a/source/blender/blenkernel/intern/mesh_remap.c b/source/blender/blenkernel/intern/mesh_remap.c index 8a2f239e4f0..082e0de38a7 100644 --- a/source/blender/blenkernel/intern/mesh_remap.c +++ b/source/blender/blenkernel/intern/mesh_remap.c @@ -192,7 +192,7 @@ static void mesh_calc_eigen_matrix( * doesn't handle casting correct we use workaround to avoid explicit * cast here. */ - vcos = (void*)cos; + vcos = (void *)cos; } unit_m4(r_mat); @@ -210,16 +210,16 @@ static void mesh_calc_eigen_matrix( /* Special handling of cases where some eigen values are (nearly) identical. */ if (compare_ff_relative(eigen_val[0], eigen_val[1], FLT_EPSILON, 64)) { - if (compare_ff_relative(eigen_val[0], eigen_val[2], FLT_EPSILON, 64)) { + if (compare_ff_relative(eigen_val[0], eigen_val[2], FLT_EPSILON, 64)) { /* No preferred direction, that set of vertices has a spherical average, - * so we simply returned scaled/translated identity matrix (with no rotation). */ + * so we simply returned scaled/translated identity matrix (with no rotation). */ unit_m3(eigen_vec); } else { /* Ellipsoid defined by eigen values/vectors has a spherical section, * we can only define one axis from eigen_vec[2] (two others computed eigen vecs * are not so nice for us here, they tend to 'randomly' rotate around valid one). - * Note that eigen vectors as returned by BLI_eigen_solve_selfadjoint_m3() are normalized. */ + * Note that eigen vectors as returned by BLI_eigen_solve_selfadjoint_m3() are normalized. */ ortho_basis_v3v3_v3(eigen_vec[0], eigen_vec[1], eigen_vec[2]); } } diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 7cb6f35b8c1..dae53955f20 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2094,10 +2094,11 @@ static void ccgDM_buffer_copy_uv_texpaint(DerivedMesh *dm, float *varray, int *U MEM_freeN(mtface_base); } -static void ccgDM_copy_gpu_data(DerivedMesh *dm, int type, float *varray, - int *mat_orig_to_new, void *user_data) +static void ccgDM_copy_gpu_data( + DerivedMesh *dm, int type, float *varray, + int *mat_orig_to_new, void *user_data) { - switch(type) { + switch (type) { case GPU_BUFFER_VERTEX: ccgDM_buffer_copy_vertex(dm, varray, mat_orig_to_new, NULL); break; @@ -2127,7 +2128,8 @@ typedef struct { int polys; } GPUMaterialInfo; -static GPUDrawObject *ccgDM_GPUObjectNew(DerivedMesh *dm) { +static GPUDrawObject *ccgDM_GPUObjectNew(DerivedMesh *dm) +{ GPUBufferMaterial *mat; int *mat_orig_to_new; CCGDerivedMesh *ccgdm = (CCGDerivedMesh *) dm; |