style cleanup: no functional changes
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2012 22:50:49 +0000 (22:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Apr 2012 22:50:49 +0000 (22:50 +0000)
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/mball.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_text/text_python.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_curve.c
source/blender/windowmanager/intern/wm_jobs.c

index 7195fb9c425783d9c427c7b7bba776d2dfae18da..5b03f73e120c6676077a66759eda2023d8a0ee6a 100644 (file)
@@ -666,8 +666,8 @@ static CollPair* cloth_edge_collision ( ModifierData *md1, ModifierData *md2,
                                                                                BVHTreeOverlap *overlap, CollPair *collpair,
                                                                                GHash *visithash, MemArena *arena)
 {
-       ClothModifierData *clmd = ( ClothModifierData * ) md1;
-       CollisionModifierData *collmd = ( CollisionModifierData * ) md2;
+       ClothModifierData *clmd = (ClothModifierData *)md1;
+       CollisionModifierData *collmd = (CollisionModifierData *) md2;
        MFace *face1=NULL, *face2 = NULL;
        ClothVertex *verts1 = clmd->clothObject->verts;
        double distance = 0;
@@ -1185,8 +1185,8 @@ int cloth_point_tri_moving_v3v3_f(float v1[2][3], int i1, float v2[2][3], int i2
 static CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap *overlap, 
                                                                   CollPair *collpair, double dt, GHash *gh, MemArena *arena)
 {
-       ClothModifierData *clmd = ( ClothModifierData * ) md1;
-       CollisionModifierData *collmd = ( CollisionModifierData * ) md2;
+       ClothModifierData *clmd = (ClothModifierData *)md1;
+       CollisionModifierData *collmd = (CollisionModifierData *) md2;
        MFace *face1=NULL, *face2 = NULL;
        ClothVertex *verts1 = clmd->clothObject->verts;
        double distance = 0;
@@ -1400,8 +1400,8 @@ static void machine_epsilon_offset(Cloth *cloth)
 static CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, 
        BVHTreeOverlap *overlap, CollPair *collpair, float dt )
 {
-       ClothModifierData *clmd = ( ClothModifierData * ) md1;
-       CollisionModifierData *collmd = ( CollisionModifierData * ) md2;
+       ClothModifierData *clmd = (ClothModifierData *)md1;
+       CollisionModifierData *collmd = (CollisionModifierData *) md2;
        Cloth *cloth = clmd->clothObject;
        MFace *face1=NULL, *face2 = NULL;
 #ifdef USE_BULLET
@@ -2285,13 +2285,13 @@ static void cloth_bvh_objcollisions_nearcheck ( ClothModifierData * clmd, Collis
 
        for ( i = 0; i < numresult; i++ )
        {
-               *collisions_index = cloth_collision ( ( ModifierData * ) clmd, ( ModifierData * ) collmd,
+               *collisions_index = cloth_collision ( (ModifierData *)clmd, (ModifierData *)collmd,
                                                                                          overlap+i, *collisions_index, dt, tri_visithash, arena );
        }
 
        for ( i = 0; i < numresult; i++ )
        {
-               *collisions_index = cloth_edge_collision ( ( ModifierData * ) clmd, ( ModifierData * ) collmd,
+               *collisions_index = cloth_edge_collision ( (ModifierData *)clmd, (ModifierData *)collmd,
                                                                                                   overlap+i, *collisions_index, visithash, arena );
        }
        BLI_ghash_free(visithash, NULL, NULL);
@@ -2300,7 +2300,7 @@ static void cloth_bvh_objcollisions_nearcheck ( ClothModifierData * clmd, Collis
 #else /* WITH_ELTOPO */
        for ( i = 0; i < numresult; i++ )
        {
-               *collisions_index = cloth_collision ( ( ModifierData * ) clmd, ( ModifierData * ) collmd,
+               *collisions_index = cloth_collision ( (ModifierData *)clmd, (ModifierData *)collmd,
                                                                                          overlap+i, *collisions_index, dt );
        }
 #endif /* WITH_ELTOPO */
index afb5e85ffa8d027fc53d09d98315f19f51cf7b38..1514716d717341ad9900983b955d5a3d38796dc0 100644 (file)
@@ -167,7 +167,7 @@ static void layerCopy_bmesh_elem_py_ptr(const void *UNUSED(source), void *dest,
        int i, size = sizeof(void *);
 
        for (i = 0; i < count; ++i) {
-               void **ptr = (void  **)((char *)dest + i * size);
+               void **ptr = (void **)((char *)dest + i * size);
                *ptr = NULL;
        }
 }
index da5e02c17f1b73d3a73dd2a395777de97655f7b4..c06d796d562227ec4dba3fa322808a4e8e20f4fc 100644 (file)
@@ -525,7 +525,7 @@ Object *find_basis_mball(Scene *scene, Object *basis)
 void calc_mballco(MetaElem *ml, float vec[3])
 {
        if (ml->mat) {
-               mul_m4_v3((float ( * )[4])ml->mat, vec);
+               mul_m4_v3((float (*)[4])ml->mat, vec);
        }
 }
 
@@ -537,7 +537,7 @@ float densfunc(MetaElem *ball, float x, float y, float z)
        vec[0]= x;
        vec[1]= y;
        vec[2]= z;
-       mul_m4_v3((float ( * )[4])ball->imat, vec);
+       mul_m4_v3((float (*)[4])ball->imat, vec);
        dx= vec[0];
        dy= vec[1];
        dz= vec[2];
@@ -1738,7 +1738,7 @@ float init_meta(Scene *scene, Object *ob) /* return totsize */
 
                                        /* transformation of Metalem bb */
                                        for (i=0; i<8; i++)
-                                               mul_m4_v3((float ( * )[4])mat, mainb[a]->bb->vec[i]);
+                                               mul_m4_v3((float (*)[4])mat, mainb[a]->bb->vec[i]);
 
                                        /* find max and min of transformed bb */
                                        for (i=0; i<8; i++) {
index 4c6819f44b13f019a3ea3bc2e425ba89e0d30d27..cce037822e3461b5443cf5b99d0a9ff1e334d83a 100644 (file)
@@ -3264,7 +3264,8 @@ void ui_draw_menu_back(uiStyle *UNUSED(style), uiBlock *block, rcti *rect)
        }       
 }
 
-uiWidgetColors *ui_tooltip_get_theme(void) {
+uiWidgetColors *ui_tooltip_get_theme(void)
+{
        uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
        return wt->wcol_theme;
 }
index 3b6e21cb3f25a489b4db49ef6a179198361ad3ed..55cf827fea6c9dc51e7d1073483b8176646cc0b2 100644 (file)
@@ -2621,7 +2621,7 @@ static void project_paint_face_init(const ProjPaintState *ps, const int thread_i
                                                                                //fac = line_point_factor_v2(uv, uv_seam_quad[0], uv_seam_quad[1]);
                                                                                
                                                                                fac = line_point_factor_v2(uv, seam_subsection[0], seam_subsection[1]);
-                                                                               if (fac < 0.0f)      { copy_v3_v3(pixelScreenCo, edge_verts_inset_clip[0]); }
+                                                                               if      (fac < 0.0f) { copy_v3_v3(pixelScreenCo, edge_verts_inset_clip[0]); }
                                                                                else if (fac > 1.0f) { copy_v3_v3(pixelScreenCo, edge_verts_inset_clip[1]); }
                                                                                else                 { interp_v3_v3v3(pixelScreenCo, edge_verts_inset_clip[0], edge_verts_inset_clip[1], fac); }
                                                                                
index c24af9988358e32ae74a941227fccca808fc39b1..23fff8fb2742a2ffe857b5e3534f2ebcac843e0c 100644 (file)
@@ -367,7 +367,8 @@ static short UNUSED_FUNCTION(do_texttools) (SpaceText * st, char ascii, unsigned
 #if 0
 #ifdef WITH_PYTHON     
 /* Run text plugin scripts if enabled */
-if (st->doplugins && event && val) {
+if (st->doplugins && event && val)
+{
        if (BPY_menu_do_shortcut(PYMENU_TEXTPLUGIN, event, qual)) {
                do_draw = 1;
        }
index 082e7676daa8d3a2c38fc31a16299320c3043064..6f637afd29318d20ea9bdc669d959be016264a98 100644 (file)
@@ -2985,10 +2985,10 @@ static int viewpan_exec(bContext *C, wmOperator *op)
        pandir = RNA_enum_get(op->ptr, "type");
 
        initgrabz(rv3d, 0.0, 0.0, 0.0);
-       if (pandir == V3D_VIEW_PANRIGHT)        { mval_f[0] = -32.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
-       else if (pandir == V3D_VIEW_PANLEFT)    { mval_f[0] =  32.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
-       else if (pandir == V3D_VIEW_PANUP)      { mval_f[1] = -25.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
-       else if (pandir == V3D_VIEW_PANDOWN)    { mval_f[1] =  25.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
+       if      (pandir == V3D_VIEW_PANRIGHT)  { mval_f[0] = -32.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
+       else if (pandir == V3D_VIEW_PANLEFT)   { mval_f[0] =  32.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
+       else if (pandir == V3D_VIEW_PANUP)     { mval_f[1] = -25.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
+       else if (pandir == V3D_VIEW_PANDOWN)   { mval_f[1] =  25.0f; ED_view3d_win_to_delta(ar, mval_f, vec); }
        add_v3_v3(rv3d->ofs, vec);
 
        if (rv3d->viewlock & RV3D_BOXVIEW)
index 62c82c58adf4e0c6e47f5862d1efcfb420a27cef..fcc9092242d8015092a37b81f4e741f0a5bdcc5b 100644 (file)
@@ -4785,7 +4785,8 @@ void projectSVData(TransInfo *t, int final)
        BLI_smallhash_release(&visit);
 }
 
-void freeSlideTempFaces(SlideData *sld) {
+void freeSlideTempFaces(SlideData *sld)
+{
        if (sld->origfaces_init) {
                SmallHashIter hiter;
                BMFace *copyf;
index 5bf52c0d552f9aa4c11805c33604dff043501f99..97cf73ab998d08eb468ecb4926dd67f88f4a59b6 100644 (file)
@@ -558,7 +558,7 @@ static void rna_Curve_spline_bezpoints_add(ID *id, Nurb *nu, ReportList *reports
 
 static Nurb *rna_Curve_spline_new(Curve *cu, int type)
 {
-       Nurb *nu = ( Nurb * ) MEM_callocN( sizeof( Nurb ), "spline.new" );
+       Nurb *nu = (Nurb *) MEM_callocN( sizeof( Nurb ), "spline.new" );
 
        if (type == CU_BEZIER) {
                BezTriple *bezt = (BezTriple *)MEM_callocN(sizeof(BezTriple), "spline.new.bezt");
index a55a8df330156724fe35c06c870c2c9ce6c4f0d2..774aec51216bd5815573ed960c63ee77dd221e3d 100644 (file)
@@ -240,8 +240,8 @@ void WM_jobs_timer(wmJob *steve, double timestep, unsigned int note, unsigned in
 void WM_jobs_callbacks(wmJob *steve, 
                        void (*startjob)(void *, short *, short *, float *),
                        void (*initjob)(void *),
-                       void (*update)(void  *),
-                       void (*endjob)(void  *))
+                       void (*update)(void *),
+                       void (*endjob)(void *))
 {
        steve->startjob = startjob;
        steve->initjob = initjob;