diff options
| author | Melanie | 2012-10-17 20:46:38 +0200 |
|---|---|---|
| committer | Melanie | 2012-10-17 20:46:38 +0200 |
| commit | 0ca96669321b1a33190d0d93ae8f7b3aee60f492 (patch) | |
| tree | ac3b6297630f461f468a13550eaabe571f993ac6 /OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |
| parent | Allow the console to be used by gods as well as region owners. (diff) | |
| parent | coment a debug warning (diff) | |
| download | opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.zip opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.gz opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.bz2 opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/KeyframeMotion.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 233e559..edf2bef 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
| @@ -575,6 +575,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 575 | Quaternion current = m_group.GroupRotation; | 575 | Quaternion current = m_group.GroupRotation; |
| 576 | 576 | ||
| 577 | Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete); | 577 | Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete); |
| 578 | step.Normalize(); | ||
| 578 | /* use simpler change detection | 579 | /* use simpler change detection |
| 579 | * float angle = 0; | 580 | * float angle = 0; |
| 580 | 581 | ||