diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 09:49:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-21 09:49:47 +0400 |
commit | 6bb626f2532757873ff2ea9f6d2571cc5f344201 (patch) | |
tree | 33d221b5ec080a5bcfb4a1d404245da9e38ecea7 /source/blender/blenlib | |
parent | 18e4f7de4f9e4a59b9123df5b2025776b11bb11d (diff) |
minor changes
- remove some warnings
- fix typos
- cmake allow in-source build (when WITH_IN_SOURCE_BUILD is defined)
- cmake, use an explicit list of rna files (don't glob)
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 8 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index eb69ddc26eb..8937612b41b 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -86,10 +86,10 @@ int isect_seg_seg_v2_point(const float v1[2], const float v2[2], const float v3[ * 2 - i1 and i2 are the nearest points on line 1 (v1, v2) and line 2 (v3, v4) respectively * */ -int isect_line_line_v3(float v1[3], float v2[3], - float v3[3], float v4[3], float i1[3], float i2[3]); -int isect_line_line_strict_v3(float v1[3], float v2[3], - float v3[3], float v4[3], float vi[3], float *lambda); +int isect_line_line_v3(const float v1[3], const float v2[3], + const float v3[3], const float v4[3], float i1[3], float i2[3]); +int isect_line_line_strict_v3(const float v1[3], const float v2[3], + const float v3[3], const float v4[3], float vi[3], float *lambda); /* line/ray triangle */ int isect_line_tri_v3(const float p1[3], const float p2[3], diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 79c07819ac1..744a15f4711 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -897,7 +897,7 @@ int isect_axial_line_tri_v3(const int axis, const float p1[3], const float p2[3] * 1 - lines are coplanar, i1 is set to intersection * 2 - i1 and i2 are the nearest points on line 1 (v1, v2) and line 2 (v3, v4) respectively * */ -int isect_line_line_v3(float v1[3], float v2[3], float v3[3], float v4[3], float i1[3], float i2[3]) +int isect_line_line_v3(const float v1[3], const float v2[3], const float v3[3], const float v4[3], float i1[3], float i2[3]) { float a[3], b[3], c[3], ab[3], cb[3], dir1[3], dir2[3]; float d; @@ -961,7 +961,7 @@ int isect_line_line_v3(float v1[3], float v2[3], float v3[3], float v4[3], float /* Intersection point strictly between the two lines * 0 when no intersection is found * */ -int isect_line_line_strict_v3(float v1[3], float v2[3], float v3[3], float v4[3], float vi[3], float *lambda) +int isect_line_line_strict_v3(const float v1[3], const float v2[3], const float v3[3], const float v4[3], float vi[3], float *lambda) { float a[3], b[3], c[3], ab[3], cb[3], ca[3], dir1[3], dir2[3]; float d; |