[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44696] trunk/blender/source: style cleanup - braces & else / if's
Campbell Barton
ideasman42 at gmail.com
Wed Mar 7 05:53:51 CET 2012
Revision: 44696
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44696
Author: campbellbarton
Date: 2012-03-07 04:53:43 +0000 (Wed, 07 Mar 2012)
Log Message:
-----------
style cleanup - braces & else / if's
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/bvhutils.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/effect.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/sketch.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/gpu/intern/gpu_material.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
trunk/blender/source/blender/modifiers/intern/MOD_simpledeform.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-07 04:41:14 UTC (rev 44695)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-07 04:53:43 UTC (rev 44696)
@@ -2473,8 +2473,7 @@
verts[0]=mvert[mface[f].v1].co; verts[1]=mvert[mface[f].v2].co; verts[2]=mvert[mface[f].v3].co;
tex_coords[0]=mtface[f].uv[0]; tex_coords[1]=mtface[f].uv[1]; tex_coords[2]=mtface[f].uv[2];
- if(nr_verts==4)
- {
+ if (nr_verts==4) {
verts[3]=mvert[mface[f].v4].co;
tex_coords[3]=mtface[f].uv[3];
}
@@ -2567,8 +2566,7 @@
sub_v2_v2v2(edge_t1, tex_coords[indices[t*3+2]], tex_coords[indices[t*3+0]]);
f2x_area_uv = fabsf(edge_t0[0]*edge_t1[1] - edge_t0[1]*edge_t1[0]);
- if ( f2x_area_uv>FLT_EPSILON )
- {
+ if (f2x_area_uv>FLT_EPSILON) {
float norm[3], v0[3], v1[3], f2x_surf_area, fsurf_ratio;
sub_v3_v3v3(v0, p1, p0);
sub_v3_v3v3(v1, p2, p0);
Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2012-03-07 04:41:14 UTC (rev 44695)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c 2012-03-07 04:53:43 UTC (rev 44696)
@@ -1124,15 +1124,12 @@
//printf("%p %s %i %f\n", ptr, path, array_index, value);
/* get property to write to */
- if (RNA_path_resolve(ptr, path, &new_ptr, &prop))
- {
+ if (RNA_path_resolve(ptr, path, &new_ptr, &prop)) {
/* set value - only for animatable numerical values */
- if (RNA_property_animateable(&new_ptr, prop))
- {
+ if (RNA_property_animateable(&new_ptr, prop)) {
int array_len= RNA_property_array_length(&new_ptr, prop);
- if (array_len && array_index >= array_len)
- {
+ if (array_len && array_index >= array_len) {
if (G.f & G_DEBUG) {
printf("Animato: Invalid array index. ID = '%s', '%s[%d]', array length is %d \n",
(ptr && ptr->id.data) ? (((ID *)ptr->id.data)->name+2) : "<No ID>",
@@ -1142,8 +1139,7 @@
return 0;
}
- switch (RNA_property_type(prop))
- {
+ switch (RNA_property_type(prop)) {
case PROP_BOOLEAN:
if (array_len)
RNA_property_boolean_set_index(&new_ptr, prop, array_index, ANIMSYS_FLOAT_AS_BOOL(value));
@@ -1251,8 +1247,7 @@
/* check if this F-Curve doesn't belong to a muted group */
if ((fcu->grp == NULL) || (fcu->grp->flag & AGRP_MUTED)==0) {
/* check if this curve should be skipped */
- if ((fcu->flag & (FCURVE_MUTED|FCURVE_DISABLED)) == 0)
- {
+ if ((fcu->flag & (FCURVE_MUTED|FCURVE_DISABLED)) == 0) {
calculate_fcurve(fcu, ctime);
animsys_execute_fcurve(ptr, remap, fcu);
}
@@ -1277,8 +1272,7 @@
short ok= 0;
/* check if this driver's curve should be skipped */
- if ((fcu->flag & (FCURVE_MUTED|FCURVE_DISABLED)) == 0)
- {
+ if ((fcu->flag & (FCURVE_MUTED|FCURVE_DISABLED)) == 0) {
/* check if driver itself is tagged for recalculation */
if ((driver) && !(driver->flag & DRIVER_FLAG_INVALID)/*&& (driver->flag & DRIVER_FLAG_RECALC)*/) { // XXX driver recalc flag is not set yet by depsgraph!
/* evaluate this using values set already in other places */
@@ -1352,8 +1346,7 @@
for (fcu= agrp->channels.first; (fcu) && (fcu->grp == agrp); fcu= fcu->next)
{
/* check if this curve should be skipped */
- if ((fcu->flag & (FCURVE_MUTED|FCURVE_DISABLED)) == 0)
- {
+ if ((fcu->flag & (FCURVE_MUTED|FCURVE_DISABLED)) == 0) {
calculate_fcurve(fcu, ctime);
animsys_execute_fcurve(ptr, remap, fcu);
}
@@ -2195,11 +2188,9 @@
* that overrides 'rough' work in NLA
*/
// TODO: need to double check that this all works correctly
- if ((recalc & ADT_RECALC_ANIM) || (adt->recalc & ADT_RECALC_ANIM))
- {
+ if ((recalc & ADT_RECALC_ANIM) || (adt->recalc & ADT_RECALC_ANIM)) {
/* evaluate NLA data */
- if ((adt->nla_tracks.first) && !(adt->flag & ADT_NLA_EVAL_OFF))
- {
+ if ((adt->nla_tracks.first) && !(adt->flag & ADT_NLA_EVAL_OFF)) {
/* evaluate NLA-stack
* - active action is evaluated as part of the NLA stack as the last item
*/
@@ -2232,8 +2223,7 @@
animsys_evaluate_overrides(&id_ptr, adt);
/* execute and clear all cached property update functions */
- if (scene)
- {
+ if (scene) {
Main *bmain = G.main; // xxx - to get passed in!
RNA_property_update_cache_flush(bmain, scene);
RNA_property_update_cache_free();
Modified: trunk/blender/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2012-03-07 04:41:14 UTC (rev 44695)
+++ trunk/blender/source/blender/blenkernel/intern/bvhutils.c 2012-03-07 04:53:43 UTC (rev 44696)
@@ -67,8 +67,7 @@
normal_tri_v3(plane_normal, v0, v1, v2);
madd_v3_v3v3fl(p1, ray->origin, ray->direction, m_dist);
- if(isect_sweeping_sphere_tri_v3(ray->origin, p1, radius, v0, v1, v2, &idist, hit_point))
- {
+ if (isect_sweeping_sphere_tri_v3(ray->origin, p1, radius, v0, v1, v2, &idist, hit_point)) {
return idist * m_dist;
}
@@ -111,23 +110,17 @@
S = A01 * B1 - A11 * B0;
T = A01 * B0 - A00 * B1;
- if ( S + T <= Det )
- {
- if ( S < 0.0f )
- {
- if ( T < 0.0f ) // Region 4
- {
- if ( B0 < 0.0f )
- {
+ if (S + T <= Det) {
+ if (S < 0.0f) {
+ if (T < 0.0f) { /* Region 4 */
+ if (B0 < 0.0f) {
T = 0.0f;
- if ( -B0 >= A00 )
- {
+ if (-B0 >= A00) {
S = 1.0f;
sqrDist = A00 + 2.0f * B0 + C;
lv = 1;
}
- else
- {
+ else {
if(fabsf(A00) > FLT_EPSILON)
S = -B0/A00;
else
@@ -136,23 +129,19 @@
le = 0;
}
}
- else
- {
+ else {
S = 0.0f;
- if ( B1 >= 0.0f )
- {
+ if (B1 >= 0.0f) {
T = 0.0f;
sqrDist = C;
lv = 0;
}
- else if ( -B1 >= A11 )
- {
+ else if (-B1 >= A11) {
T = 1.0f;
sqrDist = A11 + 2.0f * B1 + C;
lv = 2;
}
- else
- {
+ else {
if(fabsf(A11) > FLT_EPSILON)
T = -B1 / A11;
else
@@ -162,23 +151,19 @@
}
}
}
- else // Region 3
- {
+ else { /* Region 3 */
S = 0.0f;
- if ( B1 >= 0.0f )
- {
+ if (B1 >= 0.0f) {
T = 0.0f;
sqrDist = C;
lv = 0;
}
- else if ( -B1 >= A11 )
- {
+ else if (-B1 >= A11) {
T = 1.0f;
sqrDist = A11 + 2.0f * B1 + C;
lv = 2;
}
- else
- {
+ else {
if(fabsf(A11) > FLT_EPSILON)
T = -B1 / A11;
else
@@ -188,24 +173,20 @@
}
}
}
- else if ( T < 0.0f ) // Region 5
- {
+ else if (T < 0.0f) { /* Region 5 */
T = 0.0f;
- if ( B0 >= 0.0f )
- {
+ if (B0 >= 0.0f) {
S = 0.0f;
sqrDist = C;
lv = 0;
}
- else if ( -B0 >= A00 )
- {
+ else if (-B0 >= A00) {
S = 1.0f;
sqrDist = A00 + 2.0f * B0 + C;
lv = 1;
}
- else
- {
- if(fabsf(A00) > FLT_EPSILON)
+ else {
+ if (fabsf(A00) > FLT_EPSILON)
S = -B0 / A00;
else
S = 0.0f;
@@ -213,8 +194,7 @@
le = 0;
}
}
- else // Region 0
- {
+ else { /* Region 0 */
// Minimum at interior lv
float invDet;
if(fabsf(Det) > FLT_EPSILON)
@@ -224,57 +204,48 @@
S *= invDet;
T *= invDet;
sqrDist = S * ( A00 * S + A01 * T + 2.0f * B0) +
- T * ( A01 * S + A11 * T + 2.0f * B1 ) + C;
+ T * ( A01 * S + A11 * T + 2.0f * B1 ) + C;
}
}
- else
- {
+ else {
float tmp0, tmp1, numer, denom;
- if ( S < 0.0f ) // Region 2
- {
+ if (S < 0.0f) { /* Region 2 */
tmp0 = A01 + B0;
tmp1 = A11 + B1;
- if ( tmp1 > tmp0 )
- {
+ if ( tmp1 > tmp0 ) {
numer = tmp1 - tmp0;
denom = A00 - 2.0f * A01 + A11;
- if ( numer >= denom )
- {
+ if ( numer >= denom ) {
S = 1.0f;
T = 0.0f;
sqrDist = A00 + 2.0f * B0 + C;
lv = 1;
}
- else
- {
+ else {
if(fabsf(denom) > FLT_EPSILON)
S = numer / denom;
else
S = 0.0f;
T = 1.0f - S;
sqrDist = S * ( A00 * S + A01 * T + 2.0f * B0 ) +
- T * ( A01 * S + A11 * T + 2.0f * B1 ) + C;
+ T * ( A01 * S + A11 * T + 2.0f * B1 ) + C;
le = 2;
}
}
- else
- {
+ else {
S = 0.0f;
- if ( tmp1 <= 0.0f )
- {
+ if ( tmp1 <= 0.0f ) {
T = 1.0f;
sqrDist = A11 + 2.0f * B1 + C;
lv = 2;
}
- else if ( B1 >= 0.0f )
- {
+ else if (B1 >= 0.0f) {
T = 0.0f;
sqrDist = C;
lv = 0;
}
- else
- {
+ else {
if(fabsf(A11) > FLT_EPSILON)
T = -B1 / A11;
else
@@ -284,50 +255,42 @@
}
}
}
- else if ( T < 0.0f ) // Region 6
- {
+ else if (T < 0.0f) { /* Region 6 */
tmp0 = A01 + B1;
tmp1 = A00 + B0;
- if ( tmp1 > tmp0 )
- {
+ if ( tmp1 > tmp0 ) {
numer = tmp1 - tmp0;
denom = A00 - 2.0f * A01 + A11;
- if ( numer >= denom )
- {
+ if ( numer >= denom ) {
T = 1.0f;
S = 0.0f;
sqrDist = A11 + 2.0f * B1 + C;
lv = 2;
}
- else
- {
+ else {
if(fabsf(denom) > FLT_EPSILON)
T = numer / denom;
else
T = 0.0f;
S = 1.0f - T;
sqrDist = S * ( A00 * S + A01 * T + 2.0f * B0 ) +
- T * ( A01 * S + A11 * T + 2.0f * B1 ) + C;
+ T * ( A01 * S + A11 * T + 2.0f * B1 ) + C;
le = 2;
}
}
- else
- {
+ else {
T = 0.0f;
- if ( tmp1 <= 0.0f )
- {
+ if (tmp1 <= 0.0f) {
S = 1.0f;
sqrDist = A00 + 2.0f * B0 + C;
lv = 1;
}
- else if ( B0 >= 0.0f )
- {
+ else if (B0 >= 0.0f) {
S = 0.0f;
sqrDist = C;
lv = 0;
}
- else
- {
+ else {
if(fabsf(A00) > FLT_EPSILON)
S = -B0 / A00;
else
@@ -337,35 +300,30 @@
}
}
}
- else // Region 1
- {
+ else { /* Region 1 */
numer = A11 + B1 - A01 - B0;
- if ( numer <= 0.0f )
- {
+ if ( numer <= 0.0f ) {
S = 0.0f;
T = 1.0f;
sqrDist = A11 + 2.0f * B1 + C;
lv = 2;
}
- else
- {
+ else {
denom = A00 - 2.0f * A01 + A11;
- if ( numer >= denom )
- {
+ if ( numer >= denom ) {
S = 1.0f;
T = 0.0f;
sqrDist = A00 + 2.0f * B0 + C;
lv = 1;
}
- else
- {
+ else {
if(fabsf(denom) > FLT_EPSILON)
S = numer / denom;
else
S = 0.0f;
T = 1.0f - S;
sqrDist = S * ( A00 * S + A01 * T + 2.0f * B0 ) +
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list