home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-09 04:56:01 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'alteredq/dev' into dev

Browse Source
This commit is contained in:
Mr.doob
2011-10-08 02:37:16 +02:00
parent ed8df3acab 456fe3ccff
commit 3a2c28488b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/index.html
+4 -4
View File
@@ -45,8 +45,8 @@
<script>
var BlobBuilderShim = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder;
var URLShim = window.URL || window.webkitURL || window.mozURL;
window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder;
window.URL = window.URL || window.webkitURL || window.mozURL;
var Signal = signals.Signal;
@@ -151,10 +151,10 @@
case 'js':
var blob = new BlobBuilderShim();
var blob = new BlobBuilder();
blob.append( contents );
var url = URLShim.createObjectURL( blob.getBlob() );
var url = URL.createObjectURL( blob.getBlob() );
var loader = new THREE.JSONLoader();
loader.load( { model: url, callback: function ( geometry ) {