Browse Source

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

Mr.doob 12 years ago
parent
commit
33b7a1f0e3
1 changed files with 2 additions and 1 deletions
  1. 2 1
      src/extras/FontUtils.js

+ 2 - 1
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;