diff options
| author | Valerio Virgillito | 2012-03-23 15:32:47 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-03-23 15:32:47 -0700 |
| commit | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (patch) | |
| tree | c480e35abe9065733be9dd6326b91b46896b9e3a /js/lib/geom/geom-obj.js | |
| parent | bc8b0c17023ddea6d77150694a777e104ef99cbc (diff) | |
| parent | 86770d0dba6b137e651cbf5c8d240856be65857c (diff) | |
| download | ninja-7ee75fef18c21275cf29740a6fdd81ea90e41f45.tar.gz | |
Merge pull request #140 from ericmueller/integration
Integration
Diffstat (limited to 'js/lib/geom/geom-obj.js')
| -rwxr-xr-x | js/lib/geom/geom-obj.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index dbef4859..a87bdbf5 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
| @@ -248,7 +248,7 @@ var GeomObj = function GLGeomObj() { | |||
| 248 | this.exportMaterialsJSON = function() | 248 | this.exportMaterialsJSON = function() |
| 249 | { | 249 | { |
| 250 | var jObj; | 250 | var jObj; |
| 251 | if (this._materialArray && this._materialNodeArray) | 251 | if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) |
| 252 | { | 252 | { |
| 253 | var nMats = this._materialArray.length; | 253 | var nMats = this._materialArray.length; |
| 254 | if (nMats > 0) | 254 | if (nMats > 0) |