Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-02-23 06:23:42 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-23 06:23:42 +0400
commitc8b53d2aaf7ee4d07736cf842ca385e0311f3c53 (patch)
tree2feabb1078d838a001be6a32dcf7e9f00bebf70f /source/blender/blenlib
parent53fece44cf08e730bba8b8581f8bd02361f37930 (diff)
code style cleanup, no functional changes.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/intern/BLI_args.c3
-rw-r--r--source/blender/blenlib/intern/BLI_linklist.c7
-rw-r--r--source/blender/blenlib/intern/math_geom.c8
-rw-r--r--source/blender/blenlib/intern/path_util.c16
4 files changed, 18 insertions, 16 deletions
diff --git a/source/blender/blenlib/intern/BLI_args.c b/source/blender/blenlib/intern/BLI_args.c
index 04d5d57c239..bbf005e79ac 100644
--- a/source/blender/blenlib/intern/BLI_args.c
+++ b/source/blender/blenlib/intern/BLI_args.c
@@ -290,7 +290,8 @@ void BLI_argsParse(struct bArgs *ba, int pass, BA_ArgCallback default_cb, void *
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;
diff --git a/source/blender/blenlib/intern/BLI_linklist.c b/source/blender/blenlib/intern/BLI_linklist.c
index 6300817ec03..7529904c1ea 100644
--- a/source/blender/blenlib/intern/BLI_linklist.c
+++ b/source/blender/blenlib/intern/BLI_linklist.c
@@ -104,10 +104,11 @@ void BLI_linklist_append(LinkNode **listp, void *ptr)
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;
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index 500e27064d7..461f53ac434 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -1304,7 +1304,7 @@ float closest_to_line_v3(float cp[3], const float p[3], const float l1[3], const
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 closest_to_line_v2(float cp[2],const float p[2], const float l1[2], const
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 @@ void vcloud_estimate_transform(int list_size, float (*pos)[3], float *weight,flo
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++;
}
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index bbdb9bc5823..f2d88c0587b 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -118,7 +118,7 @@ int BLI_stringdec(const char *string, char *head, char *tail, unsigned short *nu
for (i = len - 1; i >= lenlslash; i--) {
if (isdigit(string[i])) {
- if (found){
+ if (found) {
nums = i;
}
else{
@@ -238,7 +238,7 @@ int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, cons
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 @@ void BLI_cleanup_path(const char *relabase, char *dir)
}
}
- 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 @@ void BLI_cleanup_path(const char *relabase, char *dir)
}
}
- 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 @@ void BLI_make_exist(char *dir)
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;
}