diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 13:02:05 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 13:02:05 +0400 |
| commit | c955272ec52c59bf0e432609b21c40c048fd6e53 (patch) | |
| tree | caf8a0cb6ff29f7b139a863802fef214cb776056 /source/blender/blenlib/intern/math_geom_inline.c | |
| parent | 57fd1fe00e2ec761c82cdcab9f6ce3c036bff3a0 (diff) | |
code cleanup
* correct cmake/clang warning.
* use same include guard names as everywhere else for BLI math inline.
* correct define for madd_sh_shfl
Diffstat (limited to 'source/blender/blenlib/intern/math_geom_inline.c')
| -rw-r--r-- | source/blender/blenlib/intern/math_geom_inline.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/blenlib/intern/math_geom_inline.c b/source/blender/blenlib/intern/math_geom_inline.c index 832ef5d15b6..9031d52cf4c 100644 --- a/source/blender/blenlib/intern/math_geom_inline.c +++ b/source/blender/blenlib/intern/math_geom_inline.c @@ -30,8 +30,8 @@ #include "BLI_math.h" -#ifndef BLI_MATH_GEOM_INLINE_H -#define BLI_MATH_GEOM_INLINE_H +#ifndef __MATH_GEOM_INLINE_C__ +#define __MATH_GEOM_INLINE_C__ /****************************** Spherical Harmonics **************************/ @@ -75,7 +75,7 @@ MINLINE float dot_shsh(float a[9], float b[9]) MINLINE float diffuse_shv3(float sh[9], const float v[3]) { /* See formula (13) in: - "An Efficient Representation for Irradiance Environment Maps" */ + * "An Efficient Representation for Irradiance Environment Maps" */ static const float c1 = 0.429043f, c2 = 0.511664f, c3 = 0.743125f; static const float c4 = 0.886227f, c5 = 0.247708f; float x, y, z, sum; @@ -97,7 +97,7 @@ MINLINE float diffuse_shv3(float sh[9], const float v[3]) MINLINE void vec_fac_to_sh(float r[9], const float v[3], const float f) { /* See formula (3) in: - "An Efficient Representation for Irradiance Environment Maps" */ + * "An Efficient Representation for Irradiance Environment Maps" */ float sh[9], x, y, z; x= v[0]; @@ -128,7 +128,7 @@ MINLINE float eval_shv3(float sh[9], const float v[3]) return dot_shsh(tmp, sh); } -MINLINE void madd_sh_shfl(float r[9], const float sh[3], const float f) +MINLINE void madd_sh_shfl(float r[9], const float sh[9], const float f) { float tmp[9]; @@ -137,5 +137,4 @@ MINLINE void madd_sh_shfl(float r[9], const float sh[3], const float f) add_sh_shsh(r, r, tmp); } -#endif /* BLI_MATH_GEOM_INLINE_H */ - +#endif /* __MATH_GEOM_INLINE_C__ */ |