From 482201d1a0a2e8002c9c8c8dda9e06b8b5c52fea Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 31 Mar 2014 05:45:28 +1100 Subject: [PATCH] Style cleanup --- source/blender/collada/ArmatureImporter.cpp | 2 +- source/blender/editors/mask/mask_ops.c | 2 +- source/blender/editors/sculpt_paint/paint_utils.c | 4 ++-- source/blender/editors/sculpt_paint/sculpt.c | 2 +- source/blender/makesrna/intern/rna_brush.c | 4 ++-- source/blender/makesrna/intern/rna_smoke.c | 2 +- source/blender/render/intern/include/texture.h | 4 ++-- .../Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index c52ee656217..e65561cbf74 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -346,7 +346,7 @@ void ArmatureImporter::create_armature_bones( ) char * bone_name = (char *)bc_get_joint_name(*ri); Bone *bone = BKE_armature_find_bone_name(armature, bone_name); - if(bone) { + if (bone) { fprintf(stderr, "Reuse of child bone [%s] as root bone in same Armature is not supported.\n", bone_name); continue; } diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c index 221c3c6ad75..e8cd97d8d6a 100644 --- a/source/blender/editors/mask/mask_ops.c +++ b/source/blender/editors/mask/mask_ops.c @@ -80,7 +80,7 @@ MaskSplinePoint *ED_mask_point_find_nearest(const bContext *C, Mask *mask, const MaskSplinePoint *point = NULL; float co[2]; const float threshold_sq = threshold * threshold; - float len_sq= FLT_MAX, scalex, scaley; + float len_sq = FLT_MAX, scalex, scaley; eMaskWhichHandle which_handle = MASK_WHICH_HANDLE_NONE; int width, height; diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index de09709fcce..4f9ca4c2675 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -170,7 +170,7 @@ float paint_get_tex_pixel(MTex *mtex, float u, float v, struct ImagePool *pool, float co[3] = {u, v, 0.0f}; externtex(mtex, co, &intensity, - rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool); + rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool); return intensity; } @@ -182,7 +182,7 @@ void paint_get_tex_pixel_col(MTex *mtex, float u, float v, float rgba[4], struct float intensity; hasrgb = externtex(mtex, co, &intensity, - rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool); + rgba, rgba + 1, rgba + 2, rgba + 3, thread, pool); if (!hasrgb) { rgba[0] = intensity; rgba[1] = intensity; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index f4d16b864fb..8b65d2c9432 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -4534,7 +4534,7 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *UNUSED(st BKE_pbvh_bmesh_detail_size_set(ss->pbvh, (ss->cache->radius / (float)ups->pixel_radius) * - (float)sd->detail_size / 0.4f); + (float)sd->detail_size / 0.4f); } if (sculpt_stroke_dynamic_topology(ss, brush)) { diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 67cea35b945..8b2c55afb93 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -473,7 +473,7 @@ static EnumPropertyItem *rna_Brush_direction_itemf(bContext *UNUSED(C), PointerR } static EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *UNUSED(ptr), - PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) + PropertyRNA *UNUSED(prop), bool *UNUSED(r_free)) { static EnumPropertyItem sculpt_stroke_method_items[] = { {0, "DOTS", 0, "Dots", "Apply paint on each mouse move step"}, @@ -486,7 +486,7 @@ static EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *UNUSED( PaintMode mode = BKE_paintmode_get_active_from_context(C); - switch(mode) { + switch (mode) { case PAINT_SCULPT: return sculpt_stroke_method_items; diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 26a25100f5d..6e0d374e3e9 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -231,7 +231,7 @@ static void rna_SmokeModifier_flame_grid_get(PointerRNA *ptr, float *values) else flame = smoke_get_flame(sds->fluid); - if(flame) + if (flame) memcpy(values, flame, size * sizeof(float)); else memset(values, 0, size * sizeof(float)); diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index 0e0337d6e0e..ff5004fd7f0 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -35,7 +35,7 @@ #define BRICONT \ texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f; \ - if(!(tex->flag & TEX_NO_CLAMP)) { \ + if (!(tex->flag & TEX_NO_CLAMP)) { \ if (texres->tin < 0.0f) texres->tin= 0.0f; \ else if (texres->tin > 1.0f) texres->tin= 1.0f; \ } \ @@ -44,7 +44,7 @@ texres->tr= tex->rfac*((texres->tr-0.5f)*tex->contrast+tex->bright-0.5f); \ texres->tg= tex->gfac*((texres->tg-0.5f)*tex->contrast+tex->bright-0.5f); \ texres->tb= tex->bfac*((texres->tb-0.5f)*tex->contrast+tex->bright-0.5f); \ - if(!(tex->flag & TEX_NO_CLAMP)) { \ + if (!(tex->flag & TEX_NO_CLAMP)) { \ if (texres->tr < 0.0f) texres->tr= 0.0f; \ if (texres->tg < 0.0f) texres->tg= 0.0f; \ if (texres->tb < 0.0f) texres->tb= 0.0f; \ diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp index 06f85b143d2..6aa90fbd6ef 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp @@ -57,7 +57,7 @@ VBO::VBO(RAS_DisplayArray *data, unsigned int indices) this->vertex_offset = (void*)(((RAS_TexVert*)0)->getXYZ()); this->normal_offset = (void*)(((RAS_TexVert*)0)->getNormal()); this->tangent_offset = (void*)(((RAS_TexVert*)0)->getTangent()); - this->color_offset = (void*)(((RAS_TexVert*)0)->getRGBA());; + this->color_offset = (void*)(((RAS_TexVert*)0)->getRGBA()); this->uv_offset = (void*)(((RAS_TexVert*)0)->getUV(0)); }