Style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Sun, 30 Mar 2014 18:45:28 +0000 (05:45 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 30 Mar 2014 18:46:19 +0000 (05:46 +1100)
source/blender/collada/ArmatureImporter.cpp
source/blender/editors/mask/mask_ops.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/render/intern/include/texture.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp

index c52ee656217b60659ecc575794a550b417ff214a..e65561cbf74e3b0d770459e95aa6ec6fdf5e4beb 100644 (file)
@@ -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;
                }
index 221c3c6ad754414f867c52481b93d91e11cf2b92..e8cd97d8d6aef4e3c59a126028c3d0c5fb55db7b 100644 (file)
@@ -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;
 
index de09709fcce75ee2abe603eb66080b4b2a34072b..4f9ca4c26754f7ac4672e971cbf709f0ee4ef076 100644 (file)
@@ -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;
index f4d16b864fb1ce83828b3ff2e24909be1bb392ea..8b65d2c9432784fdbda11f61bdecc2c5dfd972cf 100644 (file)
@@ -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)) {
index 67cea35b94517a3f4035f93143eb47b98a1f87b1..8b2c55afb93e8180a04e63203acec89dd7d86589 100644 (file)
@@ -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;
 
index 26a25100f5d901b68641f6f49e6aba3dc005a281..6e0d374e3e9dd8291cba609e1d8f8a73309b5e70 100644 (file)
@@ -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));
index 0e0337d6e0ed3a87ac57ed4c844f90998e9ad787..ff5004fd7f07862f0a8e882274ced7813282d601 100644 (file)
@@ -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;                              \
index 06f85b143d2900e186c5a484e2e1a68769fa7578..6aa90fbd6efd516aaa6ba0b819fe6d66ba1b8bdc 100644 (file)
@@ -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));
 }