From 162c3314170167f097e9befb028e71c4fde463fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 19 Jan 2013 06:12:25 +0000 Subject: [PATCH] style cleanup --- source/blender/blenkernel/BKE_particle.h | 2 +- source/blender/blenkernel/intern/multires.c | 2 +- source/blender/editors/mesh/editmesh_tools.c | 2 +- source/blender/editors/transform/transform.c | 4 ++-- source/blender/imbuf/intern/dds/Stream.cpp | 10 +++++----- source/blender/imbuf/intern/dds/dds_api.cpp | 6 +++--- source/blender/imbuf/intern/indexer.c | 4 ++-- source/blender/modifiers/intern/MOD_laplaciansmooth.c | 3 ++- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index f15ad296e4a..3394c4f4ce0 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -306,7 +306,7 @@ int psys_get_particle_state(struct ParticleSimulationData *sim, int p, struct Pa void psys_sph_init(struct ParticleSimulationData *sim, struct SPHData *sphdata); void psys_sph_finalise(struct SPHData *sphdata); -void psys_sph_density(struct BVHTree *tree, struct SPHData* data, float co[3], float vars[2]); +void psys_sph_density(struct BVHTree *tree, struct SPHData *data, float co[3], float vars[2]); /* for anim.c */ void psys_get_dupli_texture(struct ParticleSystem *psys, struct ParticleSettings *part, diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index b12463daf72..722e1f2b918 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1559,7 +1559,7 @@ static void old_mdisps_convert(MFace *mface, MDisps *mdisp) if (S == 1) { (*out)[1] = -(*out)[1]; } else if (S == 2) { SWAP(float, (*out)[0], (*out)[1]); } else if (S == 3) { (*out)[0] = -(*out)[0]; } - else if (S == 0) { SWAP(float, (*out)[0], (*out)[1]); (*out)[0] = -(*out)[0]; (*out)[1] = -(*out)[1]; }; + else if (S == 0) { SWAP(float, (*out)[0], (*out)[1]); (*out)[0] = -(*out)[0]; (*out)[1] = -(*out)[1]; } } } } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 1cf62ab9e56..a34ae23df24 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -387,7 +387,7 @@ static short edbm_extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, if (ele->head.htype == BM_FACE) { f = (BMFace *)ele; add_normal_aligned(nor, f->no); - }; + } } normalize_v3(nor); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index a18c5977b08..5672cfe96d6 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -6284,7 +6284,7 @@ int VertSlide(TransInfo *t, const int UNUSED(mval[2])) snapGrid(t, &final); /* only do this so out of range values are not displayed */ - if(is_constrained) { + if (is_constrained) { CLAMP(final, 0.0f, 1.0f); } @@ -6303,7 +6303,7 @@ int VertSlide(TransInfo *t, const int UNUSED(mval[2])) final, !is_proportional ? "ON" : "OFF", flipped ? "ON" : "OFF", (t->flag & T_ALT_TRANSFORM) ? "ON" : "OFF"); } - if(is_constrained) { + if (is_constrained) { CLAMP(final, 0.0f, 1.0f); } diff --git a/source/blender/imbuf/intern/dds/Stream.cpp b/source/blender/imbuf/intern/dds/Stream.cpp index 00e1b679c69..57a251261a1 100644 --- a/source/blender/imbuf/intern/dds/Stream.cpp +++ b/source/blender/imbuf/intern/dds/Stream.cpp @@ -47,7 +47,7 @@ unsigned int mem_read(Stream & mem, unsigned long long & i) if (mem.pos + 8 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian mem.pos += 8; return(8); @@ -58,7 +58,7 @@ unsigned int mem_read(Stream & mem, unsigned int & i) if (mem.pos + 4 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian mem.pos += 4; return(4); @@ -69,7 +69,7 @@ unsigned int mem_read(Stream & mem, unsigned short & i) if (mem.pos + 2 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian mem.pos += 2; return(2); @@ -80,7 +80,7 @@ unsigned int mem_read(Stream & mem, unsigned char & i) if (mem.pos + 1 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } i = (mem.mem + mem.pos)[0]; mem.pos += 1; return(1); @@ -91,7 +91,7 @@ unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt) if (mem.pos + cnt > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(i, mem.mem + mem.pos, cnt); mem.pos += cnt; return(cnt); diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index c41bbd594b3..4098b466377 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -136,9 +136,9 @@ struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags, char colo if (pixel.a != 255) { bits_per_pixel = 32; break; - }; - }; - }; + } + } + } ibuf = IMB_allocImBuf(dds.width(), dds.height(), bits_per_pixel, 0); if (ibuf == 0) return(0); /* memory allocation failed */ diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index 86e451e7467..56e5be7c12a 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -332,7 +332,7 @@ int IMB_proxy_size_to_array_index(IMB_Proxy_Size pr_size) return 3; default: return 0; - }; + } return 0; } @@ -352,7 +352,7 @@ int IMB_timecode_to_array_index(IMB_Timecode_Type tc) return 3; default: return 0; - }; + } return 0; } diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 62900af078e..7084fb498f0 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -385,7 +385,8 @@ static void init_laplacian_matrix(LaplacianSystem *sys) sys->ring_areas[idv2] += average_area_quad_v3(v2, v3, v4, v1); sys->ring_areas[idv3] += average_area_quad_v3(v3, v4, v1, v2); sys->ring_areas[idv4] += average_area_quad_v3(v4, v1, v2, v3); - } else { + } + else { sys->ring_areas[idv1] += areaf; sys->ring_areas[idv2] += areaf; sys->ring_areas[idv3] += areaf;