Skip to content

Commit

Permalink
Merge pull request #7566 from BSVino/dev
Browse files Browse the repository at this point in the history
Fix a documentation error
  • Loading branch information
mrdoob committed Nov 10, 2015
2 parents b7ad25a + f183222 commit c506355
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docs/api/math/Matrix4.html
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta charset="utf-8" />
<base href="../../" />
<script src="list.js"></script>
<script src="page.js"></script>
Expand Down Expand Up @@ -72,12 +72,12 @@ <h3>[method:Matrix4 copyPosition]( [page:Matrix4 m] ) [page:Matrix4 this]</h3>
Copies the translation component of the supplied matrix *m* into this matrix translation component.
</div>

<h3>[method:Matrix4 makeBasis]( [page:Vector3 xAxis], [page:Vector3 zAxis], [page:Vector3 zAxis] ) [page:Matrix4 this]</h3>
<h3>[method:Matrix4 makeBasis]( [page:Vector3 xAxis], [page:Vector3 yAxis], [page:Vector3 zAxis] ) [page:Matrix4 this]</h3>
<div>
Creates the basis matrix consisting of the three provided axis vectors. Returns the current matrix.
</div>

<h3>[method:Matrix4 extractBasis]( [page:Vector3 xAxis], [page:Vector3 zAxis], [page:Vector3 zAxis] ) [page:Matrix4 this]</h3>
<h3>[method:Matrix4 extractBasis]( [page:Vector3 xAxis], [page:Vector3 yAxis], [page:Vector3 zAxis] ) [page:Matrix4 this]</h3>
<div>
Extracts basis of into the three axis vectors provided. Returns the current matrix.
</div>
Expand Down

0 comments on commit c506355

Please sign in to comment.