[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45948] trunk/blender/source/blender: style cleanup: no functional changes
Campbell Barton
ideasman42 at gmail.com
Wed Apr 25 00:50:49 CEST 2012
Revision: 45948
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45948
Author: campbellbarton
Date: 2012-04-24 22:50:49 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
style cleanup: no functional changes
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_text/text_python.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -666,8 +666,8 @@
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 @@
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 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 @@
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 @@
#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 */
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -167,7 +167,7 @@
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;
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -525,7 +525,7 @@
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 @@
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 @@
/* 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++) {
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -3264,7 +3264,8 @@
}
}
-uiWidgetColors *ui_tooltip_get_theme(void) {
+uiWidgetColors *ui_tooltip_get_theme(void)
+{
uiWidgetType *wt = widget_type(UI_WTYPE_TOOLTIP);
return wt->wcol_theme;
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -2621,7 +2621,7 @@
//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); }
Modified: trunk/blender/source/blender/editors/space_text/text_python.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_python.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/editors/space_text/text_python.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -367,7 +367,8 @@
#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;
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -2985,10 +2985,10 @@
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)
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -4785,7 +4785,8 @@
BLI_smallhash_release(&visit);
}
-void freeSlideTempFaces(SlideData *sld) {
+void freeSlideTempFaces(SlideData *sld)
+{
if (sld->origfaces_init) {
SmallHashIter hiter;
BMFace *copyf;
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -558,7 +558,7 @@
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");
Modified: trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_jobs.c 2012-04-24 21:19:18 UTC (rev 45947)
+++ trunk/blender/source/blender/windowmanager/intern/wm_jobs.c 2012-04-24 22:50:49 UTC (rev 45948)
@@ -240,8 +240,8 @@
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;
More information about the Bf-blender-cvs
mailing list