Skip to content

Commit

Permalink
Merge pull request mrdoob#11153 from jostschmithals/docsAnimationMixe…
Browse files Browse the repository at this point in the history
…rOrder

Docs: AnimationMixer.html - fix alphabetical method order
  • Loading branch information
mrdoob authored Apr 12, 2017
2 parents 0fb06a2 + bfd02e5 commit d025e4b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions docs/api/animation/AnimationMixer.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ <h3>[method:AnimationAction existingAction]([page:AnimationClip clip], [page:Obj
The first parameter can be either an [page:AnimationClip] object or the name of an AnimationClip.
</div>

<h3>[method:Object3D getRoot]()</h3>
<div>
Returns this mixer's root object.
</div>

<h3>[method:AnimationMixer stopAllAction]()</h3>
<div>
Deactivates all previously scheduled actions on this mixer.
Expand All @@ -81,11 +86,6 @@ <h3>[method:AnimationMixer update]([page:Number deltaTimeInSeconds]) </h3>
This is usually done in the render loop, passing [page:Clock.getDelta clock.getDelta] scaled by the mixer's [page:.timeScale timeScale]).
</div>

<h3>[method:Object3D getRoot]()</h3>
<div>
Returns this mixer's root object.
</div>

<h3>[method:null uncacheClip]([page:AnimationClip clip])</h3>

<div>
Expand Down

0 comments on commit d025e4b

Please sign in to comment.