[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46979] trunk/blender: style cleanup: brace placement/newlines
Campbell Barton
ideasman42 at gmail.com
Thu May 24 18:35:45 CEST 2012
Revision: 46979
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46979
Author: campbellbarton
Date: 2012-05-24 16:35:45 +0000 (Thu, 24 May 2012)
Log Message:
-----------
style cleanup: brace placement/newlines
Modified Paths:
--------------
trunk/blender/release/plugins/sequence/dnr.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenloader/intern/versioning_250.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/space_node/node_templates.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/imbuf/intern/cineon/logImageLib.c
trunk/blender/source/blender/modifiers/intern/MOD_skin.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/rendercore.c
Modified: trunk/blender/release/plugins/sequence/dnr.c
===================================================================
--- trunk/blender/release/plugins/sequence/dnr.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/release/plugins/sequence/dnr.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -132,8 +132,9 @@
d->last_level = cast->level;
}
- if (width != d->last_width || height != d->last_height
- || cfra != d->last_cfra + 1) {
+ if (width != d->last_width || height != d->last_height ||
+ cfra != d->last_cfra + 1)
+ {
free(d->last_frame);
d->last_frame = (unsigned char*) calloc(width * height, 4);
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -4444,7 +4444,8 @@
static int hair_needs_recalc(ParticleSystem *psys)
{
if (!(psys->flag & PSYS_EDITED) && (!psys->edit || !psys->edit->edited) &&
- ((psys->flag & PSYS_HAIR_DONE)==0 || psys->recalc & PSYS_RECALC_RESET || (psys->part->flag & PART_HAIR_REGROW && !psys->edit))) {
+ ((psys->flag & PSYS_HAIR_DONE)==0 || psys->recalc & PSYS_RECALC_RESET || (psys->part->flag & PART_HAIR_REGROW && !psys->edit)))
+ {
return 1;
}
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -2190,8 +2190,9 @@
BLI_strncpy(num, de->d_name + (strlen(de->d_name) - 15), sizeof(num));
frame = atoi(num);
- if ((mode==PTCACHE_CLEAR_BEFORE && frame < cfra) ||
- (mode==PTCACHE_CLEAR_AFTER && frame > cfra) ) {
+ if ((mode == PTCACHE_CLEAR_BEFORE && frame < cfra) ||
+ (mode == PTCACHE_CLEAR_AFTER && frame > cfra))
+ {
BLI_join_dirfile(path_full, sizeof(path_full), path, de->d_name);
BLI_delete(path_full, 0, 0);
@@ -2226,8 +2227,9 @@
}
else {
while (pm) {
- if ((mode==PTCACHE_CLEAR_BEFORE && pm->frame < cfra) ||
- (mode==PTCACHE_CLEAR_AFTER && pm->frame > cfra) ) {
+ if ((mode == PTCACHE_CLEAR_BEFORE && pm->frame < cfra) ||
+ (mode == PTCACHE_CLEAR_AFTER && pm->frame > cfra))
+ {
link = pm;
if (pid->cache->cached_frames && pm->frame >=sta && pm->frame <= end)
pid->cache->cached_frames[pm->frame-sta] = 0;
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -1054,11 +1054,12 @@
a = ccdm->totface;
#endif
if ((aabbmax[0] < ccdm->bbmin[0]) ||
- (aabbmax[1] < ccdm->bbmin[1]) ||
- (aabbmax[2] < ccdm->bbmin[2]) ||
- (aabbmin[0] > ccdm->bbmax[0]) ||
- (aabbmin[1] > ccdm->bbmax[1]) ||
- (aabbmin[2] > ccdm->bbmax[2]) ) {
+ (aabbmax[1] < ccdm->bbmin[1]) ||
+ (aabbmax[2] < ccdm->bbmin[2]) ||
+ (aabbmin[0] > ccdm->bbmax[0]) ||
+ (aabbmin[1] > ccdm->bbmax[1]) ||
+ (aabbmin[2] > ccdm->bbmax[2]) )
+ {
/* boxes don't intersect */
BLI_ghashIterator_step(ihash);
continue;
@@ -1125,11 +1126,12 @@
mprevvert= ccdm->mprevvert;
outerfacethickness = ob->pd->pdef_sboft;
if ((aabbmax[0] < ccdm->bbmin[0]) ||
- (aabbmax[1] < ccdm->bbmin[1]) ||
- (aabbmax[2] < ccdm->bbmin[2]) ||
- (aabbmin[0] > ccdm->bbmax[0]) ||
- (aabbmin[1] > ccdm->bbmax[1]) ||
- (aabbmin[2] > ccdm->bbmax[2]) ) {
+ (aabbmax[1] < ccdm->bbmin[1]) ||
+ (aabbmax[2] < ccdm->bbmin[2]) ||
+ (aabbmin[0] > ccdm->bbmax[0]) ||
+ (aabbmin[1] > ccdm->bbmax[1]) ||
+ (aabbmin[2] > ccdm->bbmax[2]) )
+ {
/* boxes don't intersect */
BLI_ghashIterator_step(ihash);
continue;
@@ -1220,11 +1222,12 @@
a = ccdm->totface;
if ((aabbmax[0] < ccdm->bbmin[0]) ||
- (aabbmax[1] < ccdm->bbmin[1]) ||
- (aabbmax[2] < ccdm->bbmin[2]) ||
- (aabbmin[0] > ccdm->bbmax[0]) ||
- (aabbmin[1] > ccdm->bbmax[1]) ||
- (aabbmin[2] > ccdm->bbmax[2]) ) {
+ (aabbmax[1] < ccdm->bbmin[1]) ||
+ (aabbmax[2] < ccdm->bbmin[2]) ||
+ (aabbmin[0] > ccdm->bbmax[0]) ||
+ (aabbmin[1] > ccdm->bbmax[1]) ||
+ (aabbmin[2] > ccdm->bbmax[2]) )
+ {
/* boxes don't intersect */
BLI_ghashIterator_step(ihash);
continue;
@@ -1447,11 +1450,12 @@
a = ccdm->totface;
if ((aabbmax[0] < ccdm->bbmin[0]) ||
- (aabbmax[1] < ccdm->bbmin[1]) ||
- (aabbmax[2] < ccdm->bbmin[2]) ||
- (aabbmin[0] > ccdm->bbmax[0]) ||
- (aabbmin[1] > ccdm->bbmax[1]) ||
- (aabbmin[2] > ccdm->bbmax[2]) ) {
+ (aabbmax[1] < ccdm->bbmin[1]) ||
+ (aabbmax[2] < ccdm->bbmin[2]) ||
+ (aabbmin[0] > ccdm->bbmax[0]) ||
+ (aabbmin[1] > ccdm->bbmax[1]) ||
+ (aabbmin[2] > ccdm->bbmax[2]) )
+ {
/* boxes don't intersect */
BLI_ghashIterator_step(ihash);
continue;
@@ -1785,14 +1789,15 @@
maxz = ccdm->bbmax[2];
if ((opco[0] < minx) ||
- (opco[1] < miny) ||
- (opco[2] < minz) ||
- (opco[0] > maxx) ||
- (opco[1] > maxy) ||
- (opco[2] > maxz) ) {
- /* outside the padded boundbox --> collision object is too far away */
- BLI_ghashIterator_step(ihash);
- continue;
+ (opco[1] < miny) ||
+ (opco[2] < minz) ||
+ (opco[0] > maxx) ||
+ (opco[1] > maxy) ||
+ (opco[2] > maxz) )
+ {
+ /* outside the padded boundbox --> collision object is too far away */
+ BLI_ghashIterator_step(ihash);
+ continue;
}
}
else {
Modified: trunk/blender/source/blender/blenloader/intern/versioning_250.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_250.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/blenloader/intern/versioning_250.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -623,7 +623,7 @@
{
bConstraint *con;
- for (con = lb->first; con; con = con->next) {
+ for (con = lb->first; con; con = con->next) {
if (con->type == CONSTRAINT_TYPE_RIGIDBODYJOINT) {
bRigidBodyJointConstraint *data = con->data;
data->axX *= (float)(M_PI / 180.0);
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -3494,7 +3494,8 @@
pset->flag &= ~PE_LOCK_FIRST;
if (((pset->brushtype == PE_BRUSH_ADD) ?
- (sqrt(dx * dx + dy * dy) > pset->brush[PE_BRUSH_ADD].step) : (dx != 0 || dy != 0)) || bedit->first) {
+ (sqrt(dx * dx + dy * dy) > pset->brush[PE_BRUSH_ADD].step) : (dx != 0 || dy != 0)) || bedit->first)
+ {
PEData data= bedit->data;
view3d_operator_needs_opengl(C);
Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -712,8 +712,8 @@
{
float d1, d2, d3, d4;
float p[2] = {co[0] - pos[0], co[1] - pos[1]};
- float v1[2] = {min[0], min[1]}, v2[2] = {max[0], min[1]},
- v3[2] = {max[0], max[1]}, v4[2] = {min[0], max[1]};
+ float v1[2] = {min[0], min[1]}, v2[2] = {max[0], min[1]};
+ float v3[2] = {max[0], max[1]}, v4[2] = {min[0], max[1]};
d1 = dist_to_line_segment_v2(p, v1, v2);
d2 = dist_to_line_segment_v2(p, v2, v3);
Modified: trunk/blender/source/blender/editors/space_node/node_templates.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_templates.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/editors/space_node/node_templates.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -175,7 +175,8 @@
node_from = NULL;
if (node_prev && node_prev->type == ntemp->type &&
- (ntemp->type != NODE_GROUP || node_prev->id == &ntemp->ngroup->id)) {
+ (ntemp->type != NODE_GROUP || node_prev->id == &ntemp->ngroup->id))
+ {
/* keep the previous node if it's the same type */
node_from = node_prev;
}
Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -380,8 +380,9 @@
t->tsnap.mode = ts->snap_mode;
- if ((t->spacetype == SPACE_VIEW3D || t->spacetype == SPACE_IMAGE) && // Only 3D view or UV
- (t->flag & T_CAMERA) == 0) { // Not with camera selected in camera view
+ if ((t->spacetype == SPACE_VIEW3D || t->spacetype == SPACE_IMAGE) && /* Only 3D view or UV */
+ (t->flag & T_CAMERA) == 0) /* Not with camera selected in camera view */
+ {
setSnappingCallback(t);
/* Edit mode */
Modified: trunk/blender/source/blender/gpu/intern/gpu_codegen.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_codegen.c 2012-05-24 16:21:15 UTC (rev 46978)
+++ trunk/blender/source/blender/gpu/intern/gpu_codegen.c 2012-05-24 16:35:45 UTC (rev 46979)
@@ -387,7 +387,8 @@
/* set texid used for settings texture slot with multitexture */
if (codegen_input_has_texture(input) &&
- ((input->source == GPU_SOURCE_TEX) || (input->source == GPU_SOURCE_TEX_PIXEL))) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list