diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-05 06:30:30 +0400 |
| commit | d0412a1981266064aab38ca47f5d72ef9192e783 (patch) | |
| tree | 754a541f99f511cb65c66256b7a8dca7d2673279 /source/blender/blenkernel/intern/constraint.c | |
| parent | 936af71e9755d1f1aab05576dabb7eea73a962c2 (diff) | |
| parent | 4acab3eb33db20eef89d0159199429c690b0f2df (diff) | |
svn merge ^/trunk/blender -r43864:43887
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 4c2c05e473f..4f3fc40616b 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -496,7 +496,7 @@ static void contarget_get_mesh_mat (Object *ob, const char *substring, float mat copy_v3_v3(plane, tmat[1]); cross_v3_v3v3(mat[0], normal, plane); - if(len_v3(mat[0]) < 1e-3) { + if(len_v3(mat[0]) < 1e-3f) { copy_v3_v3(plane, tmat[0]); cross_v3_v3v3(mat[0], normal, plane); } @@ -1265,7 +1265,7 @@ static void followpath_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstr /* If the curve is cyclic, enable looping around if the time is * outside the bounds 0..1 */ if ((curvetime < 0.0f) || (curvetime > 1.0f)) { - curvetime -= floor(curvetime); + curvetime -= floorf(curvetime); } } else { |