diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-30 11:59:33 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-30 11:59:33 -0300 |
| commit | b4d5f7e154973e8fb93a9a0af6ffa0b065e2c50c (patch) | |
| tree | 67551f833464dc31c7d48e68e93b68c161e404b2 /scene/resources/animation.h | |
| parent | 4613a3f2c0d8f060cac610e2a7a401aee2ece78f (diff) | |
| parent | 55b34e05b3d735a84e1af9833e19c0b816c18252 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
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: |