Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Sat, 18 Nov 2017 06:22:54 +0000 (17:22 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 18 Nov 2017 06:22:54 +0000 (17:22 +1100)
source/blender/blenkernel/intern/collision.c
source/blender/blenlib/intern/system.c
source/blender/blentranslation/msgfmt/msgfmt.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/editors/armature/armature_select.c
source/blender/editors/space_image/image_buttons.c
source/blender/imbuf/intern/indexer.c
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/makesrna/intern/rna_image.c
source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.c

index ee25be368555533097de01492c034b3a5dbb916b..e22c62c274b231593116ccd9545f7b66c0c09377 100644 (file)
@@ -1147,9 +1147,10 @@ static CollPair *cloth_point_collision(
        return collpair;
 }
 
-static void cloth_points_objcollisions_nearcheck(ClothModifierData * clmd, CollisionModifierData *collmd,
-                                                     CollPair **collisions, CollPair **collisions_index,
-                                                     int numresult, BVHTreeOverlap *overlap, float epsilon, double dt)
+static void cloth_points_objcollisions_nearcheck(
+        ClothModifierData *clmd, CollisionModifierData *collmd,
+        CollPair **collisions, CollPair **collisions_index,
+        int numresult, BVHTreeOverlap *overlap, float epsilon, double dt)
 {
        int i;
        
@@ -1163,8 +1164,9 @@ static void cloth_points_objcollisions_nearcheck(ClothModifierData * clmd, Colli
        }
 }
 
-static int cloth_points_objcollisions_resolve(ClothModifierData * clmd, CollisionModifierData *collmd, PartDeflect *pd,
-                                              CollPair *collisions, CollPair *collisions_index, float dt)
+static int cloth_points_objcollisions_resolve(
+        ClothModifierData *clmd, CollisionModifierData *collmd, PartDeflect *pd,
+        CollPair *collisions, CollPair *collisions_index, float dt)
 {
        Cloth *cloth = clmd->clothObject;
        int i = 0, mvert_num = clmd->clothObject->mvert_num;
index 863622f25462b389bac3a318e8446a287167e5cc..ecb977c6e6154cd1ef530268856aed2244e3a01c 100644 (file)
@@ -50,8 +50,8 @@ int BLI_cpu_support_sse2(void)
            "pushl %%ebx\n\t"
            "cpuid\n\t"
            "popl %%ebx\n\t"
-               : "=d" (d)
-               : "a" (1));
+           : "=d" (d)
+           : "a" (1));
        return (d & 0x04000000) != 0;
 #elif (defined(_MSC_VER) && defined(_M_IX86))
        /* also check cpuid for MSVC x86 */
index 3abce7b1d3f601747ed5bf1487fb1dacf0609f30..49f850f200c6fd72a346056598f42d335a82ba22 100644 (file)
@@ -184,7 +184,8 @@ typedef struct Offset {
 } Offset;
 
 /* Return the generated binary output. */
-static char *generate(GHash *messages, size_t *r_output_size) {
+static char *generate(GHash *messages, size_t *r_output_size)
+{
        const uint32_t num_keys = BLI_ghash_size(messages);
 
        /* Get list of sorted keys. */
index 35bb24cc6aa027bfb139b277f5ac01297688f16d..635354a9413b1f4fe97c390d0dbc768c52ef61db 100644 (file)
@@ -825,7 +825,8 @@ void DepsgraphNodeBuilder::build_obdata_geom(Object *ob)
                                                                           (MetaBall *)obdata),
                                                             DEG_OPCODE_PLACEHOLDER,
                                                             "Geometry Eval");
-                       } else {
+                       }
+                       else {
                                op_node = add_operation_node(obdata,
                                                             DEG_NODE_TYPE_GEOMETRY,
                                                             NULL,
index f9819887094695c60f77457e8b9fbef25d676b7a..07ff7f15ce4d4924e7b2c935ed263f78ae67ddb0 100644 (file)
@@ -936,7 +936,7 @@ static void select_similar_data_pchan(
        }
 }
 
-static void is_ancestor(EditBone * bone, EditBone * ancestor)
+static void is_ancestor(EditBone *bone, EditBone *ancestor)
 {
        if (bone->temp.ebone == ancestor || bone->temp.ebone == NULL)
                return;
index d2897c7264b9c960f8abe82b892cec06ac38e958..51ccaf6800abeeb62fe57a6c720fcc3851eb8b59 100644 (file)
@@ -433,7 +433,7 @@ static void ui_imageuser_pass_menu(bContext *UNUSED(C), uiLayout *layout, void *
 
        uiItemS(layout);
 
-       nr = (rl == NULL)? 1: 0;
+       nr = (rl == NULL) ? 1 : 0;
 
        ListBase added_passes;
        BLI_listbase_clear(&added_passes);
index e1b3abcf2f6afc83b4ae8e176ee1feb639cd6fbf..009258079ee7aa3a9f0ff57b580a43eb21e00a0f 100644 (file)
@@ -843,9 +843,9 @@ static void index_rebuild_ffmpeg_finish(FFmpegIndexBuilderContext *context, int
 }
 
 static void index_rebuild_ffmpeg_proc_decoded_frame(
-       FFmpegIndexBuilderContext *context, 
-       AVPacket * curr_packet,
-       AVFrame *in_frame)
+        FFmpegIndexBuilderContext *context,
+        AVPacket *curr_packet,
+        AVFrame *in_frame)
 {
        int i;
        unsigned long long s_pos = context->seek_pos;
index 451869415e7638ff35da922f62c84a907284549a..ca534e3e2a81aaa07ca586d58b9ee91b378069f6 100644 (file)
@@ -414,11 +414,13 @@ static bool imb_save_openexr_half(
                frameBuffer.insert("R", Slice(HALF,  (char *) &to->r, xstride, ystride));
                frameBuffer.insert("G", Slice(HALF,  (char *) &to->g, xstride, ystride));
                frameBuffer.insert("B", Slice(HALF,  (char *) &to->b, xstride, ystride));
-               if (is_alpha)
+               if (is_alpha) {
                        frameBuffer.insert("A", Slice(HALF, (char *) &to->a, xstride, ystride));
-               if (is_zbuf)
+               }
+               if (is_zbuf) {
                        frameBuffer.insert("Z", Slice(Imf::FLOAT, (char *)(ibuf->zbuf_float + (height - 1) * width),
-                                                          sizeof(float), sizeof(float) * -width));
+                                                     sizeof(float), sizeof(float) * -width));
+               }
                if (ibuf->rect_float) {
                        float *from;
 
@@ -509,11 +511,13 @@ static bool imb_save_openexr_float(
                frameBuffer.insert("R", Slice(Imf::FLOAT,  (char *)rect[0], xstride, ystride));
                frameBuffer.insert("G", Slice(Imf::FLOAT,  (char *)rect[1], xstride, ystride));
                frameBuffer.insert("B", Slice(Imf::FLOAT,  (char *)rect[2], xstride, ystride));
-               if (is_alpha)
+               if (is_alpha) {
                        frameBuffer.insert("A", Slice(Imf::FLOAT,  (char *)rect[3], xstride, ystride));
-               if (is_zbuf)
+               }
+               if (is_zbuf) {
                        frameBuffer.insert("Z", Slice(Imf::FLOAT, (char *) (ibuf->zbuf_float + (height - 1) * width),
-                                                                                         sizeof(float), sizeof(float) * -width));
+                                                     sizeof(float), sizeof(float) * -width));
+               }
 
                file.setFrameBuffer(frameBuffer);
                file.writePixels(height);
@@ -1125,7 +1129,7 @@ void IMB_exr_read_channels(void *handle)
                ExrChannel *echan;
 
                for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) {
-                       if(echan->m->part_number != i) {
+                       if (echan->m->part_number != i) {
                                continue;
                        }
 
index cb5d731efc5e957c3217cfc4916059729b53d01d..cb71cf756ec996de6f313399b877527d003fd059 100644 (file)
@@ -175,7 +175,7 @@ static void rna_ImageUser_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *
 
        BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
 
-       if(ptr->id.data) {
+       if (ptr->id.data) {
                /* Update material or texture for render preview. */
                DAG_id_tag_update(ptr->id.data, 0);
        }
index 006bd0cc8bb523eeaa04312b063945cf23d42b0d..8748c884a25b3e656640b8841c42fb9bdda02e45 100644 (file)
@@ -66,7 +66,7 @@ static void node_shader_free_tex_pointdensity(bNode *node)
        MEM_freeN(point_density);
 }
 
-static void node_shader_copy_tex_pointdensity(bNodeTree * UNUSED(dest_ntree),
+static void node_shader_copy_tex_pointdensity(bNodeTree *UNUSED(dest_ntree),
                                               bNode *dest_node,
                                               bNode *src_node)
 {