Revision: 44349
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44349
Author: campbellbarton
Date: 2012-02-23 02:23:42 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
code style cleanup, no functional changes.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/BLI_args.c
trunk/blender/source/blender/blenlib/intern/BLI_linklist.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/bmesh/tools/BME_bevel.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/mesh/editmesh_add.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_modifier.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt_uv.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/transform/transform.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_manipulator.c
trunk/blender/source/blender/imbuf/intern/scaling.c
Modified: trunk/blender/source/blender/blenlib/intern/BLI_args.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_args.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/blenlib/intern/BLI_args.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -290,7 +290,8 @@
ba->passes[i + j] = pass;
}
i += retval;
- } else if (retval == -1){
+ }
+ else if (retval == -1) {
if (a) {
if (a->key->pass != -1)
ba->passes[i] = pass;
Modified: trunk/blender/source/blender/blenlib/intern/BLI_linklist.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_linklist.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/blenlib/intern/BLI_linklist.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -104,10 +104,11 @@
nlink->link = ptr;
nlink->next = NULL;
- if(node == NULL){
+ if (node == NULL) {
*listp = nlink;
- } else {
- while(node->next != NULL){
+ }
+ else {
+ while (node->next != NULL) {
node = node->next;
}
node->next = nlink;
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -1304,7 +1304,7 @@
float h[3],u[3],lambda;
sub_v3_v3v3(u, l2, l1);
sub_v3_v3v3(h, p, l1);
- lambda =dot_v3v3(u,h)/dot_v3v3(u,u);
+ lambda = dot_v3v3(u,h)/dot_v3v3(u,u);
cp[0] = l1[0] + u[0] * lambda;
cp[1] = l1[1] + u[1] * lambda;
cp[2] = l1[2] + u[2] * lambda;
@@ -1316,7 +1316,7 @@
float h[2],u[2],lambda;
sub_v2_v2v2(u, l2, l1);
sub_v2_v2v2(h, p, l1);
- lambda =dot_v2v2(u,h)/dot_v2v2(u,u);
+ lambda = dot_v2v2(u,h)/dot_v2v2(u,u);
cp[0] = l1[0] + u[0] * lambda;
cp[1] = l1[1] + u[1] * lambda;
return lambda;
@@ -2633,8 +2633,8 @@
transpose_m3(qi);
add_m3_m3m3(q,q,qi);
mul_m3_fl(q,0.5f);
- odet =ndet;
- ndet =_det_m3(q);
+ odet = ndet;
+ ndet = _det_m3(q);
i++;
}
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -118,7 +118,7 @@
for (i = len - 1; i >= lenlslash; i--) {
if (isdigit(string[i])) {
- if (found){
+ if (found) {
nums = i;
}
else{
@@ -238,7 +238,7 @@
else {
char *tempname_buf;
tempname[0]= '\0';
- tempname_buf =BLI_strncat_utf8(tempname, left,
name_len - numlen);
+ tempname_buf = BLI_strncat_utf8(tempname, left,
name_len - numlen);
memcpy(tempname_buf, numstr, numlen + 1);
}
} while(unique_check(arg, tempname));
@@ -361,12 +361,12 @@
}
}
- while ( (start = strstr(dir,"\\.\\")) ){
+ while ( (start = strstr(dir,"\\.\\")) ) {
eind = start + strlen("\\.\\") - 1;
memmove( start, eind, strlen(eind)+1 );
}
- while ( (start = strstr(dir,"\\\\" )) ){
+ while ( (start = strstr(dir,"\\\\" )) ) {
eind = start + strlen("\\\\") - 1;
memmove( start, eind, strlen(eind)+1 );
}
@@ -398,12 +398,12 @@
}
}
- while ( (start = strstr(dir,"/./")) ){
+ while ( (start = strstr(dir,"/./")) ) {
eind = start + (3 - 1) /* strlen("/./") - 1 */;
memmove( start, eind, strlen(eind)+1 );
}
- while ( (start = strstr(dir,"//" )) ){
+ while ( (start = strstr(dir,"//" )) ) {
eind = start + (2 - 1) /* strlen("//") - 1 */;
memmove( start, eind, strlen(eind)+1 );
}
@@ -1236,9 +1236,9 @@
a = strlen(dir);
- while(BLI_is_dir(dir) == 0){
+ while (BLI_is_dir(dir) == 0) {
a --;
- while(dir[a] != SEP){
+ while (dir[a] != SEP) {
a--;
if (a <= 0) break;
}
Modified: trunk/blender/source/blender/bmesh/tools/BME_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/bmesh/tools/BME_bevel.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -473,7 +473,7 @@
if (res) {
/* bmesh_jekv; */
- //void BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert
*kv, float fac, int calcnorm){
+ //void BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert
*kv, float fac, int calcnorm) {
//hrm, why is there a fac here? it just removes a vert
BM_vert_collapse_edges(bm, v->e, v);
}
@@ -596,7 +596,7 @@
l = l->radial_next;
}
- if (l->f != f){
+ if (l->f != f) {
//printf("Whoops! You got something out of order in
BME_bevel_edge()!\n");
}
@@ -770,7 +770,7 @@
weight = 0.0;
if (!BMO_elem_flag_test(bm, v, BME_BEVEL_NONMAN)) {
/* modifiers should not use selection */
- if(options & BME_BEVEL_SELECT){
+ if (options & BME_BEVEL_SELECT) {
if(BM_elem_flag_test(v, BM_ELEM_SELECT)) weight
= 1.0;
}
/* bevel weight NYI */
@@ -778,7 +778,7 @@
weight = BM_elem_float_data_get(&bm->vdata, v,
CD_BWEIGHT);
else
weight = 1.0;
- if(weight > 0.0){
+ if(weight > 0.0) {
BMO_elem_flag_enable(bm, v, BME_BEVEL_BEVEL);
BME_assign_transdata(td, bm, v, v->co, v->co,
NULL, NULL, 1.0, weight, -1, NULL);
}
@@ -795,7 +795,7 @@
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
weight = 0.0;
if (!BMO_elem_flag_test(bm, e, BME_BEVEL_NONMAN)) {
- if(options & BME_BEVEL_SELECT){
+ if(options & BME_BEVEL_SELECT) {
if(BM_elem_flag_test(e, BM_ELEM_SELECT)) weight
= 1.0;
}
else if(options & BME_BEVEL_WEIGHT) {
@@ -804,7 +804,7 @@
else {
weight = 1.0;
}
- if(weight > 0.0){
+ if(weight > 0.0) {
BMO_elem_flag_enable(bm, e, BME_BEVEL_BEVEL);
BMO_elem_flag_enable(bm, e->v1,
BME_BEVEL_BEVEL);
BMO_elem_flag_enable(bm, e->v2,
BME_BEVEL_BEVEL);
@@ -834,7 +834,7 @@
/* tag non-manifold geometr */
BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
BMO_elem_flag_enable(bm, v, BME_BEVEL_ORIG);
- if(v->e){
+ if(v->e) {
BME_assign_transdata(td, bm, v, v->co, v->co, NULL,
NULL, 0, -1, -1, NULL);
if (!BM_vert_is_manifold(bm, v))
BMO_elem_flag_enable(bm, v, BME_BEVEL_NONMAN);
@@ -948,7 +948,7 @@
/* Debug print, remov */
BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
- if(f->len == 2){
+ if(f->len == 2) {
printf("warning");
}
}
Modified: trunk/blender/source/blender/editors/armature/reeb.c
===================================================================
--- trunk/blender/source/blender/editors/armature/reeb.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/editors/armature/reeb.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -3383,7 +3383,7 @@
#if 0
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- EditMesh *em =BKE_mesh_get_editmesh(((Mesh*)obedit->data));
+ EditMesh *em = BKE_mesh_get_editmesh(((Mesh*)obedit->data));
EdgeIndex indexed_edges;
VertexData *data;
ReebGraph *rg = NULL;
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c
2012-02-23 02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c
2012-02-23 02:23:42 UTC (rev 44349)
@@ -186,7 +186,7 @@
di = MEM_callocN(sizeof(DrawInfo), "drawinfo");
di->type= ICON_TYPE_VECTOR;
- di->data.vector.func =drawFunc;
+ di->data.vector.func = drawFunc;
new_icon->drawinfo_free = NULL;
new_icon->drawinfo = di;
@@ -662,7 +662,7 @@
/* free temporary direntry structure that's been created by
BLI_dir_contents() */
i= totfile-1;
- for(; i>=0; i--){
+ for (; i>=0; i--) {
MEM_freeN(dir[i].relname);
MEM_freeN(dir[i].path);
if (dir[i].string) {
Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -56,7 +56,7 @@
static float new_primitive_matrix(bContext *C, float *loc, float *rot, float
primmat[][4])
{
Object *obedit= CTX_data_edit_object(C);
- View3D *v3d =CTX_wm_view3d(C);
+ View3D *v3d = CTX_wm_view3d(C);
float mat[3][3], rmat[3][3], cmat[3][3], imat[3][3];
unit_m4(primmat);
Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -345,7 +345,7 @@
ml= mb->editelems->first;
if(ml) {
- while(ml){
+ while(ml) {
if((ml->flag & SELECT) != invert)
ml->flag |= MB_HIDE;
ml= ml->next;
@@ -449,11 +449,11 @@
while(ml) {
for(a=0; a<hits; a++) {
/* index converted for gl stuff */
- if(ml->selcol1==buffer[ 4 * a + 3 ]){
+ if(ml->selcol1==buffer[ 4 * a + 3 ]) {
ml->flag |= MB_SCALE_RAD;
act= ml;
}
- if(ml->selcol2==buffer[ 4 * a + 3 ]){
+ if(ml->selcol2==buffer[ 4 * a + 3 ]) {
ml->flag &= ~MB_SCALE_RAD;
act= ml;
}
@@ -505,7 +505,7 @@
if(lb==NULL) return;
ml= lb->first;
- while(ml){
+ while(ml) {
next= ml->next;
BLI_remlink(lb, ml);
MEM_freeN(ml);
@@ -526,7 +526,7 @@
/* copy 'undo' MetaElems to 'edit' MetaElems */
ml= lb->first;
- while(ml){
+ while(ml) {
newml= MEM_dupallocN(ml);
BLI_addtail(editelems, newml);
ml= ml->next;
@@ -546,7 +546,7 @@
/* copy contents of current ListBase to the undo ListBase */
ml= editelems->first;
- while(ml){
+ while(ml) {
newml= MEM_dupallocN(ml);
BLI_addtail(lb, newml);
ml= ml->next;
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2012-02-23
02:17:50 UTC (rev 44348)
+++ trunk/blender/source/blender/editors/object/object_add.c 2012-02-23
02:23:42 UTC (rev 44349)
@@ -154,7 +154,7 @@
/* returns standard diameter */
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
