Merge branch 'master' into dev

mrdoob · mrdoob · commit cf85caa0aa55 · 2012-06-12T12:01:15.000-07:00
diff --git a/docs/api/core/Vector3.html b/docs/api/core/Vector3.html
@@ -146,16 +146,21 @@ <h3>.crossSelf( [page:Vector3 v] ) [page:Vector3]</h3>
 Sets this vector to cross product of itself and *v*.
 </div>
 
-<h3>.setPositionFromMatrix( [page:Matrix4 m] ) [page:Vector3]</h3>
+<h3>.getPositionFromMatrix( [page:Matrix4 m] ) [page:Vector3]</h3>
 <div>
 Sets this vector extracting position from matrix transform.
 </div>
 
-<h3>.setRotationFromMatrix( [page:Matrix4 m] ) [page:Vector3]</h3>
+<h3>.getRotationFromMatrix( [page:Matrix4 m] ) [page:Vector3]</h3>
 <div>
 Sets this vector extracting Euler angles rotation from matrix transform.
 </div>
 
+<h3>.getScaleFromMatrix( [page:Matrix4 m] ) [page:Vector3]</h3>
+<div>
+Sets this vector extracting scale from matrix transform.
+</div>
+
 <h3>.equals( [page:Vector3 v] ) [page:Vector3]</h3>
 <div>
 Checks for strict equality of this vector and *v*.
