style cleanup: indentation
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Nov 2012 09:33:28 +0000 (09:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Nov 2012 09:33:28 +0000 (09:33 +0000)
44 files changed:
source/blender/avi/intern/avi.c
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_multires.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/bmfont.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mask_evaluate.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/seqmodifier.c
source/blender/blenkernel/intern/sound.c
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/voronoi.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_decimate_unsubdivide.c
source/blender/bmesh/operators/bmo_hull.c
source/blender/compositor/operations/COM_TrackPositionOperation.cpp
source/blender/editors/animation/anim_filter.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/curve/editcurve.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/imbuf/intern/dds/FlipDXT.cpp
source/blender/imbuf/intern/divers.c
source/blender/imbuf/intern/jpeg.c
source/blender/imbuf/intern/openexr/openexr_stub.cpp
source/blender/imbuf/intern/rectop.c
source/blender/imbuf/intern/scaling.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_skin.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/python/generic/py_capi_utils.c

index e1732b0caae1c80588ac526754e298040d9c3fc4..d6301b723a79813c85aeb5997e85bd12c376bd0c 100644 (file)
@@ -665,13 +665,13 @@ AviError AVI_open_movie(const char *name, AviMovie *movie)
                        }
                }
 
-/* Some AVI's have offset entries in absolute coordinates
- * instead of an offset from the movie beginning... this is...
- * wacky, but we need to handle it. The wacky offset always
- * starts at movi_offset it seems... so we'll check that.
- * Note the the offset needs an extra 4 bytes for some 
- * undetermined reason */
+               /* Some AVI's have offset entries in absolute coordinates
               * instead of an offset from the movie beginning... this is...
               * wacky, but we need to handle it. The wacky offset always
               * starts at movi_offset it seems... so we'll check that.
+                * Note the the offset needs an extra 4 bytes for some
               * undetermined reason */
+
                if (movie->entries[0].Offset == movie->movi_offset)
                        movie->read_offset = 4;
        }
index 2f889084d0e55f6d934db07d2ef444b3321b17e3..e53d0efffbdc302350ef9da44ff6b0786ae2d5fc 100644 (file)
@@ -283,9 +283,9 @@ typedef struct IndexNode {
 void create_vert_poly_map(MeshElemMap **map, int **mem,
                           const struct MPoly *mface, const struct MLoop *mloop,
                           int totvert, int totface, int totloop);
-       
+
 void create_vert_edge_map(MeshElemMap **map, int **mem,
-                                                 const struct MEdge *medge, int totvert, int totedge);
+                          const struct MEdge *medge, int totvert, int totedge);
 
 /* vertex level transformations & checks (no derived mesh) */
 
index 8fa20eb2cc27a05993b1a217f82dd33e5648123c..bee2c374f27e697b7d4ded755e3d7ec6ade26780 100644 (file)
@@ -48,7 +48,7 @@ struct Scene;
 void multires_customdata_delete(struct Mesh *me);
 
 void multires_set_tot_level(struct Object *ob,
-                                                       struct MultiresModifierData *mmd, int lvl);
+                            struct MultiresModifierData *mmd, int lvl);
 
 void multires_mark_as_modified(struct Object *ob, enum MultiresModifiedFlags flags);
 
index fd92b7b5d69e83366572a3a842c147026305fe35..cca425a63d8fe756f02ac2a5ce37ed9a323b92a9 100644 (file)
@@ -1680,8 +1680,8 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 
                                nextmask &= ~CD_MASK_ORCO;
                                DM_set_only_copy(orcodm, nextmask | CD_MASK_ORIGINDEX |
-                                                                (mti->requiredDataMask ?
-                                                                 mti->requiredDataMask(ob, md) : 0));
+                                                (mti->requiredDataMask ?
+                                                 mti->requiredDataMask(ob, md) : 0));
                                ndm = mti->applyModifier(md, ob, orcodm, app_flags & ~MOD_APPLY_USECACHE);
 
                                if (ndm) {
index df7fb2c180771bb2223a8c3f4e78ef3a0c5f9b51..0495e7299370f63a9590488273a848e8a1e589eb 100644 (file)
@@ -247,12 +247,13 @@ int locateGlyph(bmFont *bmfont, unsigned short unicode)
        return(current);
 }
 
-void matrixGlyph(ImBuf * ibuf, unsigned short unicode,
-               float *centerx, float *centery,
-               float *sizex,   float *sizey,
-               float *transx,  float *transy,
-               float *movex,   float *movey,
-               float *advance)
+void matrixGlyph(
+        ImBuf * ibuf, unsigned short unicode,
+        float *centerx, float *centery,
+        float *sizex,   float *sizey,
+        float *transx,  float *transy,
+        float *movex,   float *movey,
+        float *advance)
 {
        int index;
        bmFont *bmfont;
index 67aaaceaa382f1ea1db8365ead7505971d2902a6..f2cd695d64abc6cdd6640b0372594952da7eaba0 100644 (file)
@@ -1117,12 +1117,12 @@ void BKE_nurb_makeCurve(Nurb *nu, float *coord_array, float *tilt_array, float *
                        sumdiv += *fp;
                }
                if (sumdiv != 0.0f) if (sumdiv < 0.999f || sumdiv > 1.001f) {
-                               /* is normalizing needed? */
-                               fp = sum;
-                               for (i = istart; i <= iend; i++, fp++) {
-                                       *fp /= sumdiv;
-                               }
+                       /* is normalizing needed? */
+                       fp = sum;
+                       for (i = istart; i <= iend; i++, fp++) {
+                               *fp /= sumdiv;
                        }
+               }
 
                /* one! (1.0) real point */
                fp = sum;
@@ -2481,8 +2481,8 @@ void BKE_curve_bevelList_make(Object *ob)
                                else
                                        bevp2 = bevp1 + 1;
 
-                               inp = (bevp1->vec[0] - bevp0->vec[0]) * (bevp0->vec[1] - bevp2->vec[1]) +
-                                               (bevp0->vec[1] - bevp1->vec[1]) * (bevp0->vec[0] - bevp2->vec[0]);
+                               inp = ((bevp1->vec[0] - bevp0->vec[0]) * (bevp0->vec[1] - bevp2->vec[1]) +
+                                      (bevp0->vec[1] - bevp1->vec[1]) * (bevp0->vec[0] - bevp2->vec[0]));
 
                                if (inp > 0.0f)
                                        sd->dir = 1;
index ef751ce3493589ee20d299522c44e11174d7956f..55d37c918592e70195157417cb3f4657832e30be 100644 (file)
@@ -1561,7 +1561,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* also a little of space to the background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and draw the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1578,7 +1578,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* and space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.note);
@@ -1594,7 +1594,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* and space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.date);
@@ -1610,7 +1610,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* and space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.rendertime);
@@ -1625,7 +1625,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* extra space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp,  display,
-                                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1641,7 +1641,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* extra space for background */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 x - BUFF_MARGIN_X, y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1656,7 +1656,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* extra space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1671,7 +1671,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* extra space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.camera);
 
@@ -1684,7 +1684,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* extra space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.cameralens);
        }
@@ -1697,7 +1697,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* extra space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1713,7 +1713,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
 
                /* extra space for background. */
                buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
-                                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.strip);
index e67df9c6419b19e45b30218886f02ececfd65d95..7d89678d36f2880d2f05e39baf4d20c39e76900a 100644 (file)
@@ -245,7 +245,7 @@ static void feather_bucket_add_edge(FeatherEdgesBucket *bucket, int start, int e
                }
                else {
                        bucket->segments = MEM_reallocN(bucket->segments,
-                                       (alloc_delta + bucket->tot_segment) * sizeof(*bucket->segments));
+                                                       (alloc_delta + bucket->tot_segment) * sizeof(*bucket->segments));
                }
 
                bucket->alloc_segment += alloc_delta;
index 6d44473583fd968ba4d2e98f2a2b890b34d86954..068059dc29aca06b68b9a2e0904c02339f54ca06 100644 (file)
@@ -2388,7 +2388,7 @@ void create_vert_poly_map(MeshElemMap **map, int **mem,
  * of edges that use that vertex as an endpoint. The lists are allocated
  * from one memory pool. */
 void create_vert_edge_map(MeshElemMap **map, int **mem,
-                                                 const MEdge *medge, int totvert, int totedge)
+                          const MEdge *medge, int totvert, int totedge)
 {
        int i, *indices;
 
index 66f2ff1225854bc032430848907b8ad9c92b1678..c737dccc5d2901a47b81d9a8ee929c90f765068b 100644 (file)
@@ -984,7 +984,7 @@ static void grid_tangent(const CCGKey *key, int x, int y, int axis, CCGElem *gri
 
 /* Construct 3x3 tangent-space matrix in 'mat' */
 static void grid_tangent_matrix(float mat[3][3], const CCGKey *key,
-                                                               int x, int y, CCGElem *grid)
+                                int x, int y, CCGElem *grid)
 {
        grid_tangent(key, x, y, 0, grid, mat[0]);
        normalize_v3(mat[0]);
index b0dcad64722f86fa97eda033437f11de541084ff..609724e802f9ac8f94ee9eed53903414e0e8180b 100644 (file)
@@ -349,9 +349,9 @@ static void hue_correct_apply_threaded(int width, int height, unsigned char *rec
                        hsv_to_rgb(hsv[0], hsv[1], hsv[2], result, result + 1, result + 2);
 
                        if (mask_rect_float)
-                                       copy_v3_v3(mask, mask_rect_float + pixel_index);
+                               copy_v3_v3(mask, mask_rect_float + pixel_index);
                        else if (mask_rect)
-                                       rgb_uchar_to_float(mask, mask_rect + pixel_index);
+                               rgb_uchar_to_float(mask, mask_rect + pixel_index);
 
                        result[0] = pixel[0] * (1.0f - mask[0]) + result[0] * mask[0];
                        result[1] = pixel[1] * (1.0f - mask[1]) + result[1] * mask[1];
index aad205bb5bf8024662c2763c6c078da63f70bace..af9d21d8cbc0c7ad0d017d24615e5b50853c7736 100644 (file)
@@ -353,17 +353,17 @@ void sound_load(struct Main *bmain, bSound *sound)
                }
 // XXX unused currently
 #if 0
-               break;
+                       break;
+               }
+               case SOUND_TYPE_BUFFER:
+                       if (sound->child_sound && sound->child_sound->handle)
+                               sound->handle = AUD_bufferSound(sound->child_sound->handle);
+                       break;
+               case SOUND_TYPE_LIMITER:
+                       if (sound->child_sound && sound->child_sound->handle)
+                               sound->handle = AUD_limitSound(sound->child_sound, sound->start, sound->end);
+                       break;
        }
-       case SOUND_TYPE_BUFFER:
-               if (sound->child_sound && sound->child_sound->handle)
-                       sound->handle = AUD_bufferSound(sound->child_sound->handle);
-               break;
-       case SOUND_TYPE_LIMITER:
-               if (sound->child_sound && sound->child_sound->handle)
-                       sound->handle = AUD_limitSound(sound->child_sound, sound->start, sound->end);
-               break;
-}
 #endif
                if (sound->flags & SOUND_FLAGS_MONO) {
                        void *handle = AUD_monoSound(sound->handle);
index 0783a7981eaaa4c51553f4a5e365abc2f3f2cf35..f51bd1cf84014703c7b5354d93802ea0504c7caa 100644 (file)
@@ -36,14 +36,18 @@ extern "C" {
 
 /********************************* Init **************************************/
 
-#define MAT4_UNITY {{ 1.0, 0.0, 0.0, 0.0}, \
-                                       { 0.0, 1.0, 0.0, 0.0}, \
-                                       { 0.0, 0.0, 1.0, 0.0}, \
-                                       { 0.0, 0.0, 0.0, 1.0}}
-
-#define MAT3_UNITY {{ 1.0, 0.0, 0.0}, \
-                                       { 0.0, 1.0, 0.0}, \
-                                       { 0.0, 0.0, 1.0}}
+#define MAT4_UNITY  {      \
+       { 1.0, 0.0, 0.0, 0.0}, \
+       { 0.0, 1.0, 0.0, 0.0}, \
+       { 0.0, 0.0, 1.0, 0.0}, \
+       { 0.0, 0.0, 0.0, 1.0}  \
+}
+
+#define MAT3_UNITY  { \
+       { 1.0, 0.0, 0.0}, \
+       { 0.0, 1.0, 0.0}, \
+       { 0.0, 0.0, 1.0}  \
+}
 
 void zero_m3(float R[3][3]);
 void zero_m4(float R[4][4]);
index 0d411038b3e0db72bcde3df6163e3a8407f48a70..601b07c9a5d709a6f09819033c293b5225c24fef 100644 (file)
@@ -609,9 +609,9 @@ static int voronoi_getNextSideCoord(ListBase *edges, float coord[2], int dim, in
 static void voronoi_createBoundaryEdges(ListBase *edges, int width, int height)
 {
        const float corners[4][2] = {{width - 1, 0.0f},
-                                                                {width - 1, height - 1},
-                                                                {0.0f, height - 1},
-                                                                {0.0f, 0.0f}};
+                                    {width - 1, height - 1},
+                                    {0.0f, height - 1},
+                                    {0.0f, 0.0f}};
        int i, dim = 0, dir = 1;
 
        float coord[2] = {0.0f, 0.0f};
index d86a26e19ac7ef2c241a62d5647fe570f0d8d891..eae78c6cc25ce416a82c70d4889d20690f9e2f84 100644 (file)
@@ -397,11 +397,11 @@ BMFace *BM_face_create_ngon_vcloud(BMesh *bm, BMVert **vert_arr, int totv, int n
 
                /* more of a weight then a distance */
                far_cross_dist = (/* first we want to have a value close to zero mapped to 1 */
-                                                 1.0f - fabsf(dot_v3v3(far_vec, far_cross_vec)) *
+                                 1.0f - fabsf(dot_v3v3(far_vec, far_cross_vec)) *
 
-                                                 /* second  we multiply by the distance
-                                                  * so points close to the center are not preferred */
-                                                 far_cross_dist);
+                                 /* second  we multiply by the distance
+                                  * so points close to the center are not preferred */
+                                 far_cross_dist);
 
                if (far_cross_dist > far_cross_best || far_cross == NULL) {
                        far_cross = vert_arr[i]->co;
index 68c0652d2c435ab8ee24fafd97b511d49ed1ba7d..1ec13010d80668d7dc5704221b5bc6fe05797e4a 100644 (file)
@@ -247,9 +247,9 @@ void BM_mesh_decimate_unsubdivide_ex(BMesh *bm, const int iterations, const int
 #ifdef USE_WALKER
                        /* Walk over selected elements starting at active */
                        BMW_init(&walker, bm, BMW_CONNECTED_VERTEX,
-                                        ELE_VERT_TAG, BMW_MASK_NOP, BMW_MASK_NOP,
-                                        BMW_FLAG_NOP, /* don't use BMW_FLAG_TEST_HIDDEN here since we want to desel all */
-                                        BMW_NIL_LAY);
+                                ELE_VERT_TAG, BMW_MASK_NOP, BMW_MASK_NOP,
+                                BMW_FLAG_NOP, /* don't use BMW_FLAG_TEST_HIDDEN here since we want to desel all */
+                                BMW_NIL_LAY);
 
                        BLI_assert(walker.order == BMW_BREADTH_FIRST);
                        for (v = BMW_begin(&walker, v_first); v != NULL; v = BMW_step(&walker)) {
index 013b6183f840e47a5337d97a22aeedf404b9521d..b9c9398fbfa5f39115af61f23025515b40dfa249 100644 (file)
@@ -426,12 +426,12 @@ static int hull_input_vert_count(BMesh *bm, BMOperator *op)
 }
 
 static BMVert **hull_input_verts_copy(BMesh *bm, BMOperator *op,
-                                                                         const int num_input_verts)
+                                      const int num_input_verts)
 {
        BMOIter oiter;
        BMVert *v;
        BMVert **input_verts = MEM_callocN(sizeof(*input_verts) *
-                                                                          num_input_verts, AT);
+                                          num_input_verts, AT);
        int i = 0;
 
        BMO_ITER (v, &oiter, bm, op, "input", BM_VERT) {
@@ -442,7 +442,7 @@ static BMVert **hull_input_verts_copy(BMesh *bm, BMOperator *op,
 }
 
 static float (*hull_verts_for_bullet(BMVert **input_verts,
-                                                                        const int num_input_verts))[3]
+                                     const int num_input_verts))[3]
 {
        float (*coords)[3] = MEM_callocN(sizeof(*coords) * num_input_verts, AT);
        int i;
@@ -455,12 +455,12 @@ static float (*hull_verts_for_bullet(BMVert **input_verts,
 }
 
 static BMVert **hull_verts_from_bullet(plConvexHull hull,
-                                                                          BMVert **input_verts,
-                                                                          const int num_input_verts)
+                                       BMVert **input_verts,
+                                       const int num_input_verts)
 {
        const int num_verts = plConvexHullNumVertices(hull);
        BMVert **hull_verts = MEM_mallocN(sizeof(*hull_verts) *
-                                                                         num_verts, AT);
+                                         num_verts, AT);
        int i;
 
        for (i = 0; i < num_verts; i++) {
@@ -479,8 +479,8 @@ static BMVert **hull_verts_from_bullet(plConvexHull hull,
 }
 
 static void hull_from_bullet(BMesh *bm, BMOperator *op,
-                                                        GHash *hull_triangles,
-                                                        BLI_mempool *pool)
+                             GHash *hull_triangles,
+                             BLI_mempool *pool)
 {
        int *fvi = NULL;
        BLI_array_declare(fvi);
@@ -523,7 +523,7 @@ static void hull_from_bullet(BMesh *bm, BMOperator *op,
                                fv[2] = hull_verts[fvi[j]];
 
                                hull_add_triangle(bm, hull_triangles, pool,
-                                                                 fv[0], fv[1], fv[2]);
+                                                 fv[0], fv[1], fv[2]);
                        }
                }
        }
index d41d1c128da1cde74cc0ce7652dcc3c5465bc189..8b5288321c13ffd037b9c26e79f8585cc1a8e1bf 100644 (file)
@@ -92,7 +92,7 @@ void TrackPositionOperation::initExecution()
                        }
                        else if (this->m_position == POSITION_RELATIVE_FRAME) {
                                int relative_clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(this->m_movieClip,
-                                               this->m_relativeFrame);
+                                                                                                   this->m_relativeFrame);
 
                                marker = BKE_tracking_marker_get(track, relative_clip_framenr);
                                copy_v2_v2(this->m_relativePos, marker->pos);
index 425ee899fe71121e226267605dc8b519dcb5aafe..5e215fbd6a20ff28cdc187a31b357fa8c5840677 100644 (file)
@@ -175,7 +175,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction)
                        return 1;
                        
                case SACTCONT_MASK: /* Mask */ /* XXX review how this mode is handled... */
-{
+               {
                        /* TODO, other methods to get the mask */
                        // Sequence *seq = BKE_sequencer_active_get(ac->scene);
                        //MovieClip *clip = ac->scene->clip;
@@ -189,7 +189,7 @@ static short actedit_get_context(bAnimContext *ac, SpaceAction *saction)
                        
                        ac->mode = saction->mode;
                        return 1;
-}
+               }
                case SACTCONT_DOPESHEET: /* DopeSheet */
                        /* update scene-pointer (no need to check for pinning yet, as not implemented) */
                        saction->ads.source = (ID *)ac->scene;
index da8fc328343812a151258d2ba4af3c5590a34acd..f9cf4a29269a55e6ee66208ddaf3f55a1d1c78dd 100644 (file)
@@ -2104,15 +2104,15 @@ static void sk_drawSketch(Scene *scene, View3D *UNUSED(v3d), SK_Sketch *sketch,
        if (sketch->depth_peels.first != NULL)
        {
                float colors[8][3] = {
-                                                               {1, 0, 0},
-                                                               {0, 1, 0},
-                                                               {0, 0, 1},
-                                                               {1, 1, 0},
-                                                               {1, 0, 1},
-                                                               {0, 1, 1},
-                                                               {1, 1, 1},
-                                                               {0, 0, 0}
-                                                       };
+                       {1, 0, 0},
+                       {0, 1, 0},
+                       {0, 0, 1},
+                       {1, 1, 0},
+                       {1, 0, 1},
+                       {0, 1, 1},
+                       {1, 1, 1},
+                       {0, 0, 0}
+               };
                DepthPeel *p;
                GLUquadric *quad = gluNewQuadric();
                gluQuadricNormals(quad, GLU_SMOOTH);
index 485d73974cd88614daa01b4974d91d7ef7d437c0..957dcfbd8481cc295751e26886781f862c3af77a 100644 (file)
@@ -6465,8 +6465,8 @@ Nurb *add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type
                                                fac = (float)b - 1.5f;
                                                bp->vec[1] += fac * grid;
                                                if (a == 1 || a == 2) if (b == 1 || b == 2) {
-                                                               bp->vec[2] += grid;
-                                                       }
+                                                       bp->vec[2] += grid;
+                                               }
                                                mul_m4_v3(mat, bp->vec);
                                                bp->vec[3] = 1.0;
                                                bp++;
index 80057ba04be7c52bef569321ce38ead0dc27ea40..20b52f50b2df9284b773ab4b296595f0646b2819 100644 (file)
@@ -1736,12 +1736,12 @@ void MESH_OT_vertices_smooth_laplacian(wmOperatorType *ot)
        /* flags */
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
-       RNA_def_int(ot->srna, "repeat", 1, 1, 200, 
-                                       "Number of iterations to smooth the mesh", "", 1, 200);
-       RNA_def_float(ot->srna, "lambda", 0.00005f, 0.0000001f, 1000.0f, 
-                                       "Lambda factor", "", 0.0000001f, 1000.0f);
-       RNA_def_float(ot->srna, "lambda_border", 0.00005f, 0.0000001f, 1000.0f, 
-                                       "Lambda factor in border", "", 0.0000001f, 1000.0f);
+       RNA_def_int(ot->srna, "repeat", 1, 1, 200,
+                   "Number of iterations to smooth the mesh", "", 1, 200);
+       RNA_def_float(ot->srna, "lambda", 0.00005f, 0.0000001f, 1000.0f,
+                     "Lambda factor", "", 0.0000001f, 1000.0f);
+       RNA_def_float(ot->srna, "lambda_border", 0.00005f, 0.0000001f, 1000.0f,
+                     "Lambda factor in border", "", 0.0000001f, 1000.0f);
        RNA_def_boolean(ot->srna, "use_x", 1, "Smooth X Axis", "Smooth object along     X axis");
        RNA_def_boolean(ot->srna, "use_y", 1, "Smooth Y Axis", "Smooth object along     Y axis");
        RNA_def_boolean(ot->srna, "use_z", 1, "Smooth Z Axis", "Smooth object along     Z axis");
index 6396a0c2cbc52a2d0cffcb628b2a889a552bda55..9ebeb61a7bbe162a31225ccc8e000f479b46172f 100644 (file)
@@ -195,7 +195,7 @@ static void paint_brush_stroke_add_step(bContext *C, wmOperator *op, wmEvent *ev
 
 /* Returns zero if no sculpt changes should be made, non-zero otherwise */
 static int paint_smooth_stroke(PaintStroke *stroke, float output[2],
-                                                          const PaintSample *sample)
+                               const PaintSample *sample)
 {
        output[0] = sample->mouse[0];
        output[1] = sample->mouse[1];
index 56d46a22e107b5b0287d5ae24306c5e8db019a29..94b00101dc2781eebba5238ed366e502a3cade65 100644 (file)
@@ -125,9 +125,11 @@ static void update_tessface_data(Object *ob, Mesh *me)
                if (!me->mcol || !me->mface) {
                        /* should always be true */
                        /* XXX Why this clearing? tessface_calc will reset it anyway! */
-/*                     if (me->mcol) {*/
-/*                             memset(me->mcol, 255, 4 * sizeof(MCol) * me->totface);*/
-/*                     }*/
+#if 0
+                       if (me->mcol) {
+                               memset(me->mcol, 255, 4 * sizeof(MCol) * me->totface);
+                       }
+#endif
 
                        /* create tessfaces because they will be used for drawing & fast updates */
                        BKE_mesh_tessface_calc(me); /* does own call to update pointers */
index 9ec2ad82bef68082d19fa35728abe1f6bbd58fba..4e53f34359ee4e930232810f3e8aa06a941453e9 100644 (file)
@@ -1065,7 +1065,7 @@ static int clip_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op))
 
        if (clip->anim) {
                pj->index_context = IMB_anim_index_rebuild_context(clip->anim, clip->proxy.build_tc_flag,
-                                       clip->proxy.build_size_flag, clip->proxy.quality);
+                                                                  clip->proxy.build_size_flag, clip->proxy.quality);
        }
 
        WM_jobs_customdata_set(wm_job, pj, proxy_freejob);
index ddc624b4cdfa3f80622d9408c741021efb2e9763..d7a9b1c0cb6fd4ea32533e5cd15dbe858c19174b 100644 (file)
 
 #include "clip_intern.h"    // own include
 
-void clip_graph_tracking_values_iterate_track(SpaceClip *sc, MovieTrackingTrack *track, void *userdata,
-               void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord,
-                             int scene_framenr, float val),
-               void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
-               void (*segment_end)(void *userdata))
+void clip_graph_tracking_values_iterate_track(
+        SpaceClip *sc, MovieTrackingTrack *track, void *userdata,
+        void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker, int coord,
+                     int scene_framenr, float val),
+        void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+        void (*segment_end)(void *userdata))
 {
        MovieClip *clip = ED_space_clip_get_clip(sc);
        int width, height, coord;
@@ -122,11 +123,12 @@ void clip_graph_tracking_values_iterate_track(SpaceClip *sc, MovieTrackingTrack
        }
 }
 
-void clip_graph_tracking_values_iterate(SpaceClip *sc, int selected_only, int include_hidden, void *userdata,
-               void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker,
-                            int coord, int scene_framenr, float val),
-               void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
-               void (*segment_end)(void *userdata))
+void clip_graph_tracking_values_iterate(
+        SpaceClip *sc, int selected_only, int include_hidden, void *userdata,
+        void (*func)(void *userdata, MovieTrackingTrack *track, MovieTrackingMarker *marker,
+                     int coord, int scene_framenr, float val),
+        void (*segment_start)(void *userdata, MovieTrackingTrack *track, int coord),
+        void (*segment_end)(void *userdata))
 {
        MovieClip *clip = ED_space_clip_get_clip(sc);
        MovieTracking *tracking = &clip->tracking;
index 5dd005e9ddfae423fea5e64cdb28cc181420e1a3..62e941d3148dd8ab0202cca6c6c6bf4b3bc50bcc 100644 (file)
@@ -2226,7 +2226,7 @@ static int node_shader_script_update_exec(bContext *C, wmOperator *op)
                data.text = CTX_data_pointer_get_type(C, "edit_text", &RNA_Text).data;
 
                if (data.text) {
-               bNodeTreeType *ntreetype = ntreeGetType(NTREE_SHADER);
+                       bNodeTreeType *ntreetype = ntreeGetType(NTREE_SHADER);
 
                        if (ntreetype && ntreetype->foreach_nodetree)
                                ntreetype->foreach_nodetree(bmain, &data, node_shader_script_update_text);
index c4afe32e85fc17872606e87ad3d450aa7d1968f0..2c40e0e656dd5f5df092814fee3829a4ac0bd34e 100644 (file)
@@ -1042,7 +1042,7 @@ static void tselem_draw_icon(uiBlock *block, int xmax, float x, float y, TreeSto
                                        /* Default */
                                        case eModifierType_None:
                                        case eModifierType_ShapeKey:
-                               case NUM_MODIFIER_TYPES:
+                                       case NUM_MODIFIER_TYPES:
                                                UI_icon_draw(x, y, ICON_DOT); break;
                                }
                                break;
index 8e268e46696c1990713295f0134a43a5406685b5..9bbd3f59cbfed3602394bf37ede4d82edacbe185 100644 (file)
@@ -5037,9 +5037,10 @@ static void special_aftertrans_update__mask(bContext *C, TransInfo *t)
        if (t->scene->nodetree) {
                /* tracks can be used for stabilization nodes,
                 * flush update for such nodes */
-               //if (nodeUpdateID(t->scene->nodetree, &mask->id)) {
+               //if (nodeUpdateID(t->scene->nodetree, &mask->id))
+               {
                        WM_event_add_notifier(C, NC_MASK | ND_DATA, &mask->id);
-               //}
+               }
        }
 
        /* TODO - dont key all masks... */
index ee7a0ebb2f7758eb2fffc9272effe4ddc766cf23..05821b27ca6884894279f654fe7770cacb2baaf6 100644 (file)
@@ -140,10 +140,10 @@ static void FlipDXT5BlockFull(uint8_t *block)
        unsigned int line_2_3 = block[5] + 256 * (block[6] + 256 * block[7]);
        // swap lines 0 and 1 in line_0_1.
        unsigned int line_1_0 = ((line_0_1 & 0x000fff) << 12) |
-                       ((line_0_1 & 0xfff000) >> 12);
+                               ((line_0_1 & 0xfff000) >> 12);
        // swap lines 2 and 3 in line_2_3.
        unsigned int line_3_2 = ((line_2_3 & 0x000fff) << 12) |
-                       ((line_2_3 & 0xfff000) >> 12);
+                               ((line_2_3 & 0xfff000) >> 12);
 
        block[2] = line_3_2 & 0xff;
        block[3] = (line_3_2 & 0xff00) >> 8;
@@ -162,7 +162,7 @@ static void FlipDXT5BlockHalf(uint8_t *block)
        // See layout above.
        unsigned int line_0_1 = block[2] + 256 * (block[3] + 256 * block[4]);
        unsigned int line_1_0 = ((line_0_1 & 0x000fff) << 12) |
-                       ((line_0_1 & 0xfff000) >> 12);
+                               ((line_0_1 & 0xfff000) >> 12);
        block[2] = line_1_0 & 0xff;
        block[3] = (line_1_0 & 0xff00) >> 8;
        block[4] = (line_1_0 & 0xff0000) >> 8;
index 55c1b02e90b4aa117e741d0e3d7e39d77befee20..8d289de997022e4a3bd6aa78b30d5f2937aa7f49 100644 (file)
@@ -583,23 +583,23 @@ void IMB_partial_rect_from_float(ImBuf *ibuf, float *buffer, int x, int y, int w
        if (is_data) {
                /* exception for non-color data, just copy float */
                IMB_buffer_float_from_float(buffer, rect_float,
-                                                                       ibuf->channels, IB_PROFILE_LINEAR_RGB, IB_PROFILE_LINEAR_RGB, 0,
-                                                                       w, h, w, ibuf->x);
+                                           ibuf->channels, IB_PROFILE_LINEAR_RGB, IB_PROFILE_LINEAR_RGB, 0,
+                                           w, h, w, ibuf->x);
 
                /* and do color space conversion to byte */
                IMB_buffer_byte_from_float(rect_byte, rect_float,
-                                                                  4, ibuf->dither, IB_PROFILE_SRGB, profile_from, predivide,
-                                                                  w, h, ibuf->x, w);
+                                          4, ibuf->dither, IB_PROFILE_SRGB, profile_from, predivide,
+                                          w, h, ibuf->x, w);
        }
        else {
                IMB_buffer_float_from_float(buffer, rect_float,
-                                                                       ibuf->channels, IB_PROFILE_SRGB, profile_from, predivide,
-                                                                       w, h, w, ibuf->x);
+                                           ibuf->channels, IB_PROFILE_SRGB, profile_from, predivide,
+                                           w, h, w, ibuf->x);
 
                /* XXX: need to convert to image buffer's rect space */
                IMB_buffer_byte_from_float(rect_byte, buffer,
-                                                                  4, ibuf->dither, IB_PROFILE_SRGB, IB_PROFILE_SRGB, 0,
-                                                                  w, h, ibuf->x, w);
+                                          4, ibuf->dither, IB_PROFILE_SRGB, IB_PROFILE_SRGB, 0,
+                                          w, h, ibuf->x, w);
        }
 
        /* ensure user flag is reset */
index 61275a8937c2c7eb824f76509954499dc368aab7..d96a01d709359ca5185d8aa7ed1cd01c553f7eca 100644 (file)
@@ -235,19 +235,19 @@ static void memory_source(j_decompress_ptr cinfo, unsigned char *buffer, size_t
  */
 #define INPUT_BYTE(cinfo, V, action)  \
        MAKESTMT(MAKE_BYTE_AVAIL(cinfo,action); \
-                 bytes_in_buffer--; \
-                 V = GETJOCTET(*next_input_byte++); )
+                bytes_in_buffer--; \
+                V = GETJOCTET(*next_input_byte++); )
 
 /* As above, but read two bytes interpreted as an unsigned 16-bit integer.
  * V should be declared unsigned int or perhaps INT32.
  */
 #define INPUT_2BYTES(cinfo, V, action)  \
        MAKESTMT(MAKE_BYTE_AVAIL(cinfo,action); \
-                 bytes_in_buffer--; \
-                 V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \
-                 MAKE_BYTE_AVAIL(cinfo, action); \
-                 bytes_in_buffer--; \
-                 V += GETJOCTET(*next_input_byte++); )
+             bytes_in_buffer--; \
+             V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \
+             MAKE_BYTE_AVAIL(cinfo, action); \
+             bytes_in_buffer--; \
+             V += GETJOCTET(*next_input_byte++); )
 
 
 static boolean
index 7262656d4e82565e3bb12b65f2abdbeb922606cf..21fa878c08af4fe952b9b8de886886ab183098d7 100644 (file)
 #include "openexr_multi.h"
 
 
-void * IMB_exr_get_handle                      (void) {return NULL;}
-void   IMB_exr_add_channel                     (void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) {  (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
+void   *IMB_exr_get_handle          (void) {return NULL;}
+void    IMB_exr_add_channel         (void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) {  (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
 
-int            IMB_exr_begin_read                      (void *handle, const char *filename, int *width, int *height) { (void)handle; (void)filename; (void)width; (void)height; return 0;}
-int            IMB_exr_begin_write                     (void *handle, const char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; return 0;}
-void   IMB_exrtile_begin_write         (void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley) { (void)handle; (void)filename; (void)mipmap; (void)width; (void)height; (void)tilex; (void)tiley; }
+int     IMB_exr_begin_read          (void *handle, const char *filename, int *width, int *height) { (void)handle; (void)filename; (void)width; (void)height; return 0;}
+int     IMB_exr_begin_write         (void *handle, const char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; return 0;}
+void    IMB_exrtile_begin_write     (void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley) { (void)handle; (void)filename; (void)mipmap; (void)width; (void)height; (void)tilex; (void)tiley; }
 
-void   IMB_exr_set_channel                     (void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
+void    IMB_exr_set_channel         (void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
 
-void   IMB_exr_read_channels           (void *handle) { (void)handle; }
-void   IMB_exr_write_channels          (void *handle) { (void)handle; }
-void   IMB_exrtile_write_channels      (void *handle, int partx, int party, int level) { (void)handle; (void)partx; (void)party; (void)level; }
-void   IMB_exrtile_clear_channels      (void *handle) { (void)handle; }
+void    IMB_exr_read_channels       (void *handle) { (void)handle; }
+void    IMB_exr_write_channels      (void *handle) { (void)handle; }
+void    IMB_exrtile_write_channels  (void *handle, int partx, int party, int level) { (void)handle; (void)partx; (void)party; (void)level; }
+void    IMB_exrtile_clear_channels  (void *handle) { (void)handle; }
 
-void    IMB_exr_multilayer_convert     (void *handle, void *base,  
-                                                                        void * (*addlayer)(void *base, const char *str),
-                                                                        void (*addpass)(void *base, void *lay, const char *str, float *rect, int totchan, const char *chan_id))
-                                                                       {
-                                                                               (void)handle; (void)base; (void)addlayer; (void)addpass;
-                                                                       }
+void    IMB_exr_multilayer_convert  (void *handle, void *base,
+                                     void * (*addlayer)(void *base, const char *str),
+                                     void (*addpass)(void *base, void *lay, const char *str, float *rect, int totchan, const char *chan_id))
+{
+       (void)handle; (void)base; (void)addlayer; (void)addpass;
+}
 
-void   IMB_exr_close                           (void *handle) { (void)handle; }
+void    IMB_exr_close               (void *handle) { (void)handle; }
index 8e072361583dfca18646d4f5adb556a9f3625b1d..d2b0645cf93e76f098bfb81841dee26ac1ea0244 100644 (file)
@@ -587,7 +587,7 @@ void IMB_rectfill_area(struct ImBuf *ibuf, const float col[4], int x1, int y1, i
 {
        if (!ibuf) return;
        buf_rectfill_area((unsigned char *) ibuf->rect, ibuf->rect_float, ibuf->x, ibuf->y, col, display,
-                                         x1, y1, x2, y2);
+                         x1, y1, x2, y2);
 }
 
 
index 527f334d6a4bd8b2a30acb1f96bae596f3bceec8..b9525ccccf147cc8a5c43171e69bdb0a843068bc 100644 (file)
@@ -331,13 +331,13 @@ void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1)
                for (y = ibuf2->y; y > 0; y--) {
                        p2f = p1f + (ibuf1->x << 2);
                        for (x = ibuf2->x; x > 0; x--) {
-                                       destf[0] = 0.25f * (p1f[0] + p2f[0] + p1f[4] + p2f[4]);
-                                       destf[1] = 0.25f * (p1f[1] + p2f[1] + p1f[5] + p2f[5]);
-                                       destf[2] = 0.25f * (p1f[2] + p2f[2] + p1f[6] + p2f[6]);
-                                       destf[3] = 0.25f * (p1f[3] + p2f[3] + p1f[7] + p2f[7]);
-                                       p1f += 8; 
-                                       p2f += 8; 
-                                       destf += 4;
+                               destf[0] = 0.25f * (p1f[0] + p2f[0] + p1f[4] + p2f[4]);
+                               destf[1] = 0.25f * (p1f[1] + p2f[1] + p1f[5] + p2f[5]);
+                               destf[2] = 0.25f * (p1f[2] + p2f[2] + p1f[6] + p2f[6]);
+                               destf[3] = 0.25f * (p1f[3] + p2f[3] + p1f[7] + p2f[7]);
+                               p1f += 8;
+                               p2f += 8;
+                               destf += 4;
                        }
                        p1f = p2f;
                        if (ibuf1->x & 1) p1f += 4;
index bef5e5cc16147c18a608228b88a422433db72cbe..fa0b313a12014846ba96a6a7410ed2c5c08032ff 100644 (file)
@@ -1001,7 +1001,7 @@ static int make_structDNA(char *baseDirectory, FILE *file)
        /* FOR DEBUG */
        if (debugSDNA > 1) {
                int a, b;
-/*          short *elem; */
+               /* short *elem; */
                short num_types;
 
                printf("nr_names %d nr_types %d nr_structs %d\n", nr_names, nr_types, nr_structs);
index 7c4ce3d18d7fc67a3bdb19810f412d2e8277fb40..8a71adec772d65d979af1e3cb95f0fa14e8cf1a5 100644 (file)
@@ -80,13 +80,15 @@ static void rna_generate_static_parameter_prototypes(FILE *f, StructRNA *srna, F
                                                      const char *name_override, int close_prototype);
 
 /* helpers */
-#define WRITE_COMMA { \
+#define WRITE_COMMA \
+       { \
                if (!first) \
                        fprintf(f, ", "); \
                first = 0; \
        } (void)0
 
-#define WRITE_PARAM(param) { \
+#define WRITE_PARAM(param) \
+       { \
                WRITE_COMMA; \
                fprintf(f, param); \
        }
@@ -3579,10 +3581,10 @@ static void rna_generate_header_class_cpp(StructDefRNA *ds, FILE *f)
        fprintf(f, "class %s : public %s {\n", srna->identifier, (srna->base) ? srna->base->identifier : "Pointer");
        fprintf(f, "public:\n");
        fprintf(f, "\t%s(const PointerRNA &ptr_arg) :\n\t\t%s(ptr_arg)", srna->identifier,
-                       (srna->base) ? srna->base->identifier : "Pointer");
+               (srna->base) ? srna->base->identifier : "Pointer");
        for (dp = ds->cont.properties.first; dp; dp = dp->next)
                if (rna_is_collection_prop(dp->prop))
-                               fprintf(f, ",\n\t\t%s(ptr_arg)", dp->prop->identifier);
+                       fprintf(f, ",\n\t\t%s(ptr_arg)", dp->prop->identifier);
        fprintf(f, "\n\t\t{}\n\n");
 
        for (dp = ds->cont.properties.first; dp; dp = dp->next)
index e96ed4f38d3bf55562c2b81f51b881fd04ae132e..7bdebd620eea8cb3358eb55cf117598b9b146133 100644 (file)
@@ -146,8 +146,8 @@ static int rna_SculptCapabilities_has_overlay_get(PointerRNA *ptr)
 {
        Brush *br = (Brush *)ptr->data;
        return ELEM(br->mtex.brush_map_mode,
-                               MTEX_MAP_MODE_VIEW,
-                               MTEX_MAP_MODE_TILED);
+                   MTEX_MAP_MODE_VIEW,
+                   MTEX_MAP_MODE_TILED);
 }
 
 static int rna_SculptCapabilities_has_persistence_get(PointerRNA *ptr)
index 170e6147d99c9f0a1c4610466d326e1e30e221fc..287995e0aa6cd46d8a2430d67955f27283c76b7c 100644 (file)
@@ -2809,7 +2809,7 @@ static void rna_def_mesh(BlenderRNA *brna)
        prop = RNA_def_property(srna, "skin_vertices", PROP_COLLECTION, PROP_NONE);
        RNA_def_property_collection_sdna(prop, NULL, "vdata.layers", "vdata.totlayer");
        RNA_def_property_collection_funcs(prop, "rna_Mesh_skin_vertices_begin", NULL, NULL, NULL,
-                                                                         "rna_Mesh_skin_vertices_length", NULL, NULL, NULL);
+                                         "rna_Mesh_skin_vertices_length", NULL, NULL, NULL);
        RNA_def_property_struct_type(prop, "MeshSkinVertexLayer");
        RNA_def_property_ui_text(prop, "Skin Vertices", "All skin vertices");
        rna_def_skin_vertices(brna, prop);
index d241f697be04ac8953632dc3692d11f8215b3d5a..67e876b70a00cc491001801ac0ee0cd241759ce6 100644 (file)
@@ -1204,7 +1204,7 @@ typedef struct NodeInfo {
 static NodeInfo nodes[MaxNodes];
 
 static void reg_node(int ID, int category, const char *enum_name, const char *struct_name,
-               const char *base_name, const char *ui_name, const char *ui_desc)
+                     const char *base_name, const char *ui_name, const char *ui_desc)
 {
        NodeInfo *ni = nodes + ID;
        
index 92ad6faa3ce9fa492337a86242f2d67367c4fd22..1298d281de8a2d79efe27705c2e09307adaccc05 100644 (file)
@@ -205,7 +205,8 @@ static MFace *get_dface(DerivedMesh *dm, DerivedMesh *split, int cur, int i, MFa
        return df;
 }
 
-#define SET_VERTS(a, b, c, d)  {        \
+#define SET_VERTS(a, b, c, d)           \
+       {                                   \
                v[0] = mf->v##a; uv[0] = a - 1; \
                v[1] = mf->v##b; uv[1] = b - 1; \
                v[2] = mf->v##c; uv[2] = c - 1; \
index 8a4d70da6e8c05574e0624afb962440beeb24634..80966fee5991018823bb1b462afbbe4111c87d00 100644 (file)
@@ -644,8 +644,8 @@ typedef struct {
 } EdgeStackElem;
 
 static void build_emats_stack(BLI_Stack *stack, int *visited_e, EMat *emat,
-                                                         const MeshElemMap *emap, const MEdge *medge,
-                                                         const MVertSkin *vs, const MVert *mvert)
+                              const MeshElemMap *emap, const MEdge *medge,
+                              const MVertSkin *vs, const MVert *mvert)
 {
        EdgeStackElem stack_elem;
        float axis[3], angle;
@@ -673,7 +673,7 @@ static void build_emats_stack(BLI_Stack *stack, int *visited_e, EMat *emat,
        /* If parent is a branch node, start a new edge chain */
        if (parent_is_branch) {
                calc_edge_mat(emat[e].mat, mvert[parent_v].co,
-                                         mvert[v].co);
+                             mvert[v].co);
        }
        else {
                /* Build edge matrix guided by parent matrix */
@@ -959,12 +959,12 @@ static void add_poly(SkinOutput *so,
 
 static void connect_frames(SkinOutput *so,
                            BMVert *frame1[4],
-                           BMVert *frame2[4])
+BMVert *frame2[4])
 {
        BMVert *q[4][4] = {{frame2[0], frame2[1], frame1[1], frame1[0]},
-                                          {frame2[1], frame2[2], frame1[2], frame1[1]},
-                                          {frame2[2], frame2[3], frame1[3], frame1[2]},
-                                          {frame2[3], frame2[0], frame1[0], frame1[3]}};
+                          {frame2[1], frame2[2], frame1[2], frame1[1]},
+                          {frame2[2], frame2[3], frame1[3], frame1[2]},
+                          {frame2[3], frame2[0], frame1[0], frame1[3]}};
        float p[3], no[3];
        int i, swap;
 
index cc77d73a736f75134a40d9420bc5450fd0e8d52c..fbd3c084e70eadd2378ede6d97115f5c3e9394b4 100644 (file)
@@ -207,9 +207,10 @@ BLI_INLINE void madd_v3v3short_fl(float r[3], const short a[3], const float f)
        r[2] += (float)a[2] * f;
 }
 
-static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
-               DerivedMesh *dm,
-               ModifierApplyFlag UNUSED(flag))
+static DerivedMesh *applyModifier(
+        ModifierData *md, Object *ob,
+        DerivedMesh *dm,
+        ModifierApplyFlag UNUSED(flag))
 {
        int i;
        DerivedMesh *result;
index 3b8193c422dcbc6dca4e2bb9f54538b6960dd3bb..b8537a1359f3fce8c81f272a87ae2b8c51ea95b4 100644 (file)
@@ -504,7 +504,7 @@ void PyC_SetHomePath(const char *py_path_bundle)
         * but current Python lib (release 3.1.1) doesn't handle these correctly */
        if (strchr(py_path_bundle, ':'))
                printf("Warning : Blender application is located in a path containing : or / chars\
-                          \nThis may make python import function fail\n");
+                      \nThis may make python import function fail\n");
 #endif