Revision: 49555
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49555
Author: campbellbarton
Date: 2012-08-04 12:30:16 +0000 (Sat, 04 Aug 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/bmfont.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/blenloader/intern/undofile.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/render/render_preview.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/screen/screen_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
Modified: trunk/blender/source/blender/blenkernel/intern/bmfont.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bmfont.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/blenkernel/intern/bmfont.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -75,7 +75,7 @@
if (ibuf) {
rect = (char *) ibuf->rect;
- for (i = ibuf->x * ibuf->y ; i > 0 ; i--) {
+ for (i = ibuf->x * ibuf->y; i > 0; i--) {
rect[3] = MAX3(rect[0], rect[1], rect[2]);
rect += 4;
}
Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/blenkernel/intern/font.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -851,7 +851,7 @@
/* do nothing */
}
-// if ((mem[j]!='\r') && (mem[j]!='\n') &&
(mem[j])) {
+// if ((mem[j] != '\r') && (mem[j] != '\n') &&
(mem[j])) {
ct->xof += ct->charnr * linedata[ct->linenr];
// }
ct++;
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -2227,7 +2227,7 @@
/* for old scened this can be uninitialized,
* should probably be added to do_versions at some point if the
functionality stays */
if (context.scene->r.seq_prev_type == 0)
- context.scene->r.seq_prev_type = 3 /* ==OB_SOLID */;
+ context.scene->r.seq_prev_type = 3 /* == OB_SOLID */;
/* opengl offscreen render */
BKE_scene_update_for_newframe(context.bmain, scene, scene->lay);
Modified: trunk/blender/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -261,7 +261,9 @@
{
int len=0;
- if (dst_w==NULL || src_c==NULL) return(0);
+ if (dst_w == NULL || src_c == NULL) {
+ return 0;
+ }
while (*src_c && len < maxcpy) {
size_t step= 0;
Modified: trunk/blender/source/blender/blenloader/intern/undofile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/undofile.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/blenloader/intern/undofile.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -104,7 +104,7 @@
static MemFileChunk *compchunk = NULL;
MemFileChunk *curchunk;
- /* this function inits when compare != NULL or when current==NULL */
+ /* this function inits when compare != NULL or when current == NULL */
if (compare) {
compchunk = compare->chunks.first;
return;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -1312,7 +1312,7 @@
*
*/
- /* Here we check for consistancy and create 2 edges */
+ /* Here we check for consistency and create 2 edges */
if (totf == 0 && totv >= 4 && totv == tote + 2) {
/* find a free standing vertex and 2 endpoint verts */
BMVert *v_free = NULL, *v_a = NULL, *v_b = NULL;
Modified: trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
2012-08-04 11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/compositor/nodes/COM_DefocusNode.cpp
2012-08-04 12:30:16 UTC (rev 49555)
@@ -105,7 +105,8 @@
VariableSizeBokehBlurOperation *operation = new
VariableSizeBokehBlurOperation();
if (data->preview) {
operation->setQuality(COM_QUALITY_LOW);
- } else {
+ }
+ else {
operation->setQuality(context->getQuality());
}
operation->setMaxBlur(data->maxblur);
Modified:
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
2012-08-04 11:42:38 UTC (rev 49554)
+++
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
2012-08-04 12:30:16 UTC (rev 49555)
@@ -156,7 +156,8 @@
newInput.xmin = input->xmin - (this->m_size * this->getWidth()
/ 100.0f);
newInput.ymax = input->ymax + (this->m_size * this->getWidth()
/ 100.0f);
newInput.ymin = input->ymin - (this->m_size * this->getWidth()
/ 100.0f);
- } else {
+ }
+ else {
newInput.xmax = input->xmax + (10.0f * this->getWidth() /
100.0f);
newInput.xmin = input->xmin - (10.0f * this->getWidth() /
100.0f);
newInput.ymax = input->ymax + (10.0f * this->getWidth() /
100.0f);
Modified:
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
2012-08-04 11:42:38 UTC (rev 49554)
+++
trunk/blender/source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
2012-08-04 12:30:16 UTC (rev 49555)
@@ -50,7 +50,8 @@
output->xmax = tempOutput.xmax;
output->ymax = tempOutput.ymax;
first = false;
- } else {
+ }
+ else {
output->xmin = MIN2(output->xmin,
tempOutput.xmin);
output->ymin = MIN2(output->ymin,
tempOutput.ymin);
output->xmax = MAX2(output->xmax,
tempOutput.xmax);
Modified:
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
2012-08-04 11:42:38 UTC (rev 49554)
+++
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
2012-08-04 12:30:16 UTC (rev 49555)
@@ -286,7 +286,8 @@
if (refradx == 1 && refrady == 1) {
memorybuffer->readNoCheck(color, x, y);
- } else {
+ }
+ else {
int minxr = x - refradx < 0 ? -x : -refradx;
int maxxr = x + refradx > imgx ? imgx - x : refradx;
int minyr = y - refrady < 0 ? -y : -refrady;
Modified:
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
===================================================================
---
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
2012-08-04 11:42:38 UTC (rev 49554)
+++
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
2012-08-04 12:30:16 UTC (rev 49555)
@@ -78,7 +78,8 @@
newInput.ymin = input->ymin;
newInput.xmin = input->xmin - this->m_kr2 - 2;
newInput.xmax = input->xmax + this->m_kr2 + 2;
- } else {
+ }
+ else {
newInput.xmin = input->xmin - 7; /* (0.25f * 20 * 1) + 2 ==
worse case dispersion */
newInput.ymin = input->ymin;
newInput.ymax = input->ymax;
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c
2012-08-04 11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2012-08-04 12:30:16 UTC (rev 49555)
@@ -4775,7 +4775,7 @@
distance = distfactor_to_bone(verts[i], root[j], tip[j],
bone->rad_head * scale,
bone->rad_tail * scale, bone->dist * scale);
- /* add the vert to the deform group if weight!=0.0 */
+ /* add the vert to the deform group if (weight != 0.0)
*/
if (distance != 0.0f)
ED_vgroup_vert_add(ob, dgroup, i, distance,
WEIGHT_REPLACE);
else
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -1427,8 +1427,8 @@
static short isNurbselUV(Nurb *nu, int *u, int *v, int flag)
{
- /* return u!=-1: 1 row in u-direction selected. U has value between
0-pntsv
- * return v!=-1: 1 column in v-direction selected. V has value between
0-pntsu
+ /* return (u != -1): 1 row in u-direction selected. U has value between
0-pntsv
+ * return (v != -1): 1 column in v-direction selected. V has value
between 0-pntsu
*/
BPoint *bp;
int a, b, sel;
Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c 2012-08-04
11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/editors/object/object_select.c 2012-08-04
12:30:16 UTC (rev 49555)
@@ -416,7 +416,7 @@
if (nr == OBJECT_SELECT_LINKED_IPO) {
// XXX old animation system
- //if (ob->ipo==0) return OPERATOR_CANCELLED;
+ //if (ob->ipo == 0) return OPERATOR_CANCELLED;
//object_select_all_by_ipo(C, ob->ipo)
return OPERATOR_CANCELLED;
}
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c
2012-08-04 11:42:38 UTC (rev 49554)
+++ trunk/blender/source/blender/editors/render/render_preview.c
2012-08-04 12:30:16 UTC (rev 49555)
@@ -705,7 +705,7 @@
}
else {
/* validate owner */
- //if (ri->rect==NULL)
+ //if (ri->rect == NULL)
// ri->rect=
MEM_mallocN(sizeof(int)*ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
//RE_ResultGet32(re, ri->rect);
}
Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c 2012-08-04 11:42:38 UTC
(rev 49554)
+++ trunk/blender/source/blender/editors/screen/area.c 2012-08-04 12:30:16 UTC
(rev 49555)
@@ -1297,7 +1297,7 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
