diff options
| author | volzhs <volzhs@gmail.com> | 2015-07-01 15:13:10 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2015-07-01 15:13:10 +0900 |
| commit | f6668dc9db34fc4a3ef9e9e309e0fc248c3f51a8 (patch) | |
| tree | 0c9a6e5cd8b6d3fdfab3cb6aff41458a08841133 /scene/resources/animation.h | |
| parent | 903e6b37c0ed94cd0b3447dd3ff471abbfaa4460 (diff) | |
| parent | b4d5f7e154973e8fb93a9a0af6ffa0b065e2c50c (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot into fix_android_payments
Diffstat (limited to 'scene/resources/animation.h')
| -rw-r--r-- | scene/resources/animation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/animation.h b/scene/resources/animation.h index d4042646fb..256826a4bb 100644 --- a/scene/resources/animation.h +++ b/scene/resources/animation.h @@ -204,7 +204,7 @@ private: return idxr; } - bool _transform_track_optimize_key(const TKey<TransformKey> &t0,const TKey<TransformKey> &t1, const TKey<TransformKey> &t2, float p_alowed_linear_err,float p_alowed_angular_err,float p_max_optimizable_angle); + bool _transform_track_optimize_key(const TKey<TransformKey> &t0,const TKey<TransformKey> &t1, const TKey<TransformKey> &t2, float p_alowed_linear_err,float p_alowed_angular_err,float p_max_optimizable_angle,const Vector3& p_norm); void _transform_track_optimize(int p_idx, float p_allowed_err=0.05, float p_alowed_angular_err=0.01,float p_max_optimizable_angle=Math_PI*0.125); protected: |