diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-12 01:27:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-12 01:27:14 +0400 |
| commit | 202109a8f5a8a1f82de6d765476ded85fe15ea59 (patch) | |
| tree | 577e69ec0b42c15c7738e550c089be3ce84f0133 /source/blender/blenkernel | |
| parent | a144793af1456d39f5d0218529215e64dda3dfc7 (diff) | |
code cleanup: set enums as static or add RNA_enum_types.h where they are used elsewhere.
also minor style cleanup.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/navmesh_conversion.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/navmesh_conversion.c b/source/blender/blenkernel/intern/navmesh_conversion.c index 68564a1e298..3c499908bf7 100644 --- a/source/blender/blenkernel/intern/navmesh_conversion.c +++ b/source/blender/blenkernel/intern/navmesh_conversion.c @@ -367,7 +367,7 @@ int buildNavMeshData(const int nverts, const float *verts, /* create detailed mesh triangles - copy only valid triangles * and reserve memory for adjacency info */ dtris = MEM_callocN(sizeof(unsigned short) * 3 * 2 * ndtris, "buildNavMeshData dtris"); - memset(dtris, 0xffff, sizeof(unsigned short) * 3 * 2 * ndtris); + memset(dtris, 0xff, sizeof(unsigned short) * 3 * 2 * ndtris); for (i = 0; i < ndtris; i++) { memcpy(dtris + 3 * 2 * i, tris + 3 * dtrisToTrisMap[i], sizeof(unsigned short) * 3); } diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 1525ded0dd8..2c84fbd8680 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -3363,10 +3363,10 @@ static void track_plane_from_existing_motion(MovieTrackingPlaneTrack *plane_trac next_plane_marker && (plane_track->flag & PLANE_TRACK_AUTOKEY)) { - float fac = ((float) next_plane_marker->framenr - start_plane_marker->framenr) - / ((float) keyframe_plane_marker->framenr - start_plane_marker->framenr); + float fac = ((float) next_plane_marker->framenr - start_plane_marker->framenr) / + ((float) keyframe_plane_marker->framenr - start_plane_marker->framenr); - fac = 3*fac*fac - 2*fac*fac*fac; + fac = 3 * fac * fac - 2 * fac * fac * fac; for (i = 0; i < 4; i++) { interp_v2_v2v2(new_plane_marker.corners[i], new_plane_marker.corners[i], |