Merge remote-tracking branch 'bhouston/THREE.TypeFaces' into dev

wrotki · Apr 14, 2013 · 33b7a1f · 33b7a1f
2 parents 42e1ae2 + 3dcf635
commit 33b7a1f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/extras/FontUtils.js b/src/extras/FontUtils.js
@@ -456,4 +456,5 @@ THREE.FontUtils.generateShapes = function( text, parameters ) {
 })(THREE.FontUtils);
 
 // To use the typeface.js face files, hook up the API
-self._typeface_js = { faces: THREE.FontUtils.faces, loadFace: THREE.FontUtils.loadFace };
+self._typeface_js = { faces: THREE.FontUtils.faces, loadFace: THREE.FontUtils.loadFace };
+THREE.typeface_js = self._typeface_js;