[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45830] trunk/blender/source/blender: style cleanup: multi-line if statements.
Campbell Barton
ideasman42 at gmail.com
Sat Apr 21 17:11:03 CEST 2012
Revision: 45830
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45830
Author: campbellbarton
Date: 2012-04-21 15:11:03 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
style cleanup: multi-line if statements.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenkernel/intern/writeframeserver.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/blenlib/intern/rand.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/filelist.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_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_shrinkwrap.c
trunk/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/shadeoutput.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -424,17 +424,18 @@
else { /* use OpenGL VBOs or Vertex Arrays instead for better, faster rendering */
int prevstart = 0;
int prevdraw = 1;
- int draw = 1;
+ int draw = TRUE;
GPU_edge_setup(dm);
- if ( !GPU_buffer_legacy(dm) ) {
+ if (!GPU_buffer_legacy(dm)) {
for (i = 0; i < dm->numEdgeData; i++, medge++) {
- if ((drawAllEdges || (medge->flag&ME_EDGEDRAW))
- && (drawLooseEdges || !(medge->flag&ME_LOOSEEDGE))) {
- draw = 1;
+ if ((drawAllEdges || (medge->flag & ME_EDGEDRAW)) &&
+ (drawLooseEdges || !(medge->flag & ME_LOOSEEDGE)))
+ {
+ draw = TRUE;
}
else {
- draw = 0;
+ draw = FALSE;
}
if ( prevdraw != draw ) {
if ( prevdraw > 0 && (i-prevstart) > 0 ) {
@@ -539,8 +540,7 @@
new_matnr = mface->mat_nr + 1;
new_shademodel = (mface->flag & ME_SMOOTH)?GL_SMOOTH:GL_FLAT;
- if (new_glmode != glmode || new_matnr != matnr
- || new_shademodel != shademodel) {
+ if (new_glmode != glmode || new_matnr != matnr || new_shademodel != shademodel) {
glEnd();
drawCurrentMat = setMaterial(matnr = new_matnr, NULL);
Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -446,9 +446,9 @@
BKE_ptcache_id_time(&pid, scene, framenr, &startframe, &endframe, ×cale);
clmd->sim_parms->timescale= timescale;
- if (clmd->sim_parms->reset
- || (framenr == (startframe - clmd->sim_parms->preroll) && clmd->sim_parms->preroll != 0)
- || (clmd->clothObject && dm->getNumVerts(dm) != clmd->clothObject->numverts))
+ if (clmd->sim_parms->reset ||
+ (framenr == (startframe - clmd->sim_parms->preroll) && clmd->sim_parms->preroll != 0) ||
+ (clmd->clothObject && dm->getNumVerts(dm) != clmd->clothObject->numverts))
{
clmd->sim_parms->reset = 0;
cache->flag |= PTCACHE_OUTDATED;
@@ -1176,8 +1176,8 @@
// check for existing spring
// check also if startpoint is equal to endpoint
- if ( !BLI_edgehash_haskey ( edgehash, MIN2(tspring2->ij, index2), MAX2(tspring2->ij, index2) )
- && ( index2!=tspring2->ij ) )
+ if (!BLI_edgehash_haskey(edgehash, MIN2(tspring2->ij, index2), MAX2(tspring2->ij, index2)) &&
+ (index2 != tspring2->ij))
{
spring = ( ClothSpring * ) MEM_callocN ( sizeof ( ClothSpring ), "cloth spring" );
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -2502,8 +2502,8 @@
if ( clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL )
{
- if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED )
- && ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
+ if ( ( cloth->verts [i].flags & CLOTH_VERT_FLAG_PINNED ) &&
+ ( cloth->verts [j].flags & CLOTH_VERT_FLAG_PINNED ) )
{
continue;
}
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -1810,9 +1810,9 @@
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
*/
- while (dest_i < dest->totlayer
- && dest->layers[dest_i].type < source->layers[src_i].type)
+ while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
++dest_i;
+ }
/* if there are no more dest layers, we're done */
if (dest_i >= dest->totlayer) return;
@@ -1901,9 +1901,9 @@
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
*/
- while (dest_i < dest->totlayer
- && dest->layers[dest_i].type < source->layers[src_i].type)
+ while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
++dest_i;
+ }
/* if there are no more dest layers, we're done */
if (dest_i >= dest->totlayer) return;
@@ -2272,9 +2272,9 @@
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
*/
- while (dest_i < dest->totlayer
- && dest->layers[dest_i].type < source->layers[src_i].type)
+ while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
++dest_i;
+ }
/* if there are no more dest layers, we're done */
if (dest_i >= dest->totlayer) return;
@@ -2504,9 +2504,9 @@
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
*/
- while (dest_i < dest->totlayer
- && dest->layers[dest_i].type < source->layers[src_i].type)
+ while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
++dest_i;
+ }
/* if there are no more dest layers, we're done */
if (dest_i >= dest->totlayer) return;
@@ -2547,9 +2547,9 @@
/* find the first dest layer with type >= the source type
* (this should work because layers are ordered by type)
*/
- while (dest_i < dest->totlayer
- && dest->layers[dest_i].type < source->layers[src_i].type)
+ while (dest_i < dest->totlayer && dest->layers[dest_i].type < source->layers[src_i].type) {
++dest_i;
+ }
/* if there are no more dest layers, we're done */
if (dest_i >= dest->totlayer) return;
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -1844,8 +1844,7 @@
BKE_ptcache_id_time(&pid, scene, (float)scene->r.cfra, NULL, NULL, NULL);
/* reset non-baked cache at first frame */
- if ((int)scene->r.cfra == surface->start_frame && !(cache->flag & PTCACHE_BAKED))
- {
+ if ((int)scene->r.cfra == surface->start_frame && !(cache->flag & PTCACHE_BAKED)) {
cache->flag |= PTCACHE_REDO_NEEDED;
BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
cache->flag &= ~PTCACHE_REDO_NEEDED;
@@ -1856,8 +1855,7 @@
BKE_ptcache_validate(cache, (int)scene->r.cfra);
}
/* if read failed and we're on surface range do recalculate */
- else if ((int)scene->r.cfra == current_frame
- && !(cache->flag & PTCACHE_BAKED)) {
+ else if ((int)scene->r.cfra == current_frame && !(cache->flag & PTCACHE_BAKED)) {
/* calculate surface frame */
canvas->flags |= MOD_DPAINT_BAKING;
dynamicPaint_calculateFrame(surface, scene, ob, current_frame);
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -1148,8 +1148,9 @@
if (extension) {
/* prefer this in many cases to avoid .png.tga, but in certain cases it breaks */
/* remove any other known image extension */
- if (BLI_testextensie_array(string, imb_ext_image)
- || (G.have_quicktime && BLI_testextensie_array(string, imb_ext_image_qt))) {
+ if (BLI_testextensie_array(string, imb_ext_image) ||
+ (G.have_quicktime && BLI_testextensie_array(string, imb_ext_image_qt)))
+ {
return BLI_replace_extension(string, FILE_MAX, extension);
}
else {
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -1260,8 +1260,8 @@
/*
if (length>L)
{
- if ((clmd->sim_parms->flags & CSIMSETT_FLAG_TEARING_ENABLED)
- && ((((length-L)*100.0f/L) > clmd->sim_parms->maxspringlen))) // cut spring!
+ if ((clmd->sim_parms->flags & CSIMSETT_FLAG_TEARING_ENABLED) &&
+ ((((length-L)*100.0f/L) > clmd->sim_parms->maxspringlen))) // cut spring!
{
s->flags |= CSPRING_FLAG_DEACTIVATE;
return;
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -76,7 +76,7 @@
types_init= 0;
}
- /* type unsigned, no need to chech < 0 */
+ /* type unsigned, no need to check < 0 */
if (type < NUM_MODIFIER_TYPES && types[type]->name[0] != '\0') {
return types[type];
}
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-21 14:14:58 UTC (rev 45829)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-04-21 15:11:03 UTC (rev 45830)
@@ -2631,9 +2631,11 @@
if (psys_check_enabled(ob, psys)) {
/* check use of dupli objects here */
if (psys->part && (psys->part->draw_as == PART_DRAW_REND || G.rendering) &&
- ((psys->part->ren_as == PART_DRAW_OB && psys->part->dup_ob)
- || (psys->part->ren_as == PART_DRAW_GR && psys->part->dup_group)))
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list