diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-12 04:50:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-12 04:50:40 +0400 |
| commit | 502ddd312879316c13f66d84c4ffe0927df53a06 (patch) | |
| tree | 51a18bef238f47e385d909c591e98d2023086854 /source/blender/blenlib | |
| parent | 742c1cb3284fed8a9fdef1cb899a3eaaf896cd41 (diff) | |
code cleanup: warnings and style.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_math_vector.h | 4 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/storage.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index 15c977981a5..ee0a9db4f02 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -169,7 +169,7 @@ MINLINE float normalize_v3_v3(float r[3], const float a[3]); /******************************* Interpolation *******************************/ void interp_v2_v2v2(float r[2], const float a[2], const float b[2], const float t); -void interp_v2_v2v2v2(float r[2], const float a[2], const float b[2], const float c[3], const float t[3]); +void interp_v2_v2v2v2(float r[2], const float a[2], const float b[2], const float c[2], const float t[3]); void interp_v3_v3v3(float r[3], const float a[3], const float b[3], const float t); void interp_v3_v3v3v3(float p[3], const float v1[3], const float v2[3], const float v3[3], const float w[3]); void interp_v3_v3v3v3v3(float p[3], const float v1[3], const float v2[3], const float v3[3], const float v4[3], const float w[4]); @@ -193,7 +193,7 @@ MINLINE int is_one_v3(const float a[3]); MINLINE int equals_v2v2(const float v1[2], const float v2[2]); MINLINE int equals_v3v3(const float a[3], const float b[3]); -MINLINE int compare_v2v2(const float a[3], const float b[3], const float limit); +MINLINE int compare_v2v2(const float a[2], const float b[2], const float limit); MINLINE int compare_v3v3(const float a[3], const float b[3], const float limit); MINLINE int compare_len_v3v3(const float a[3], const float b[3], const float limit); diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 3665b957c41..24d4f7cdfe3 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -520,7 +520,7 @@ int BLI_exists(const char *name) /* change error mode so user does not get a "no disk in drive" popup * when looking for a file on an empty CD/DVD drive */ - old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); + old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); #ifndef __MINGW32__ res = _wstat(tmp_16, &st); |