diff options
| author | Nivesh Rajbhandari | 2012-03-24 13:53:34 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-24 13:53:34 -0700 |
| commit | 5e8faa47e1b2507a09d04fea4325006e5eab2f25 (patch) | |
| tree | 56683c1be0485f560ff49e8125f0b19dd42199f3 /js/lib/geom/geom-obj.js | |
| parent | 2946d01666ff81f913bd06d1ac1381ed42b4a010 (diff) | |
| parent | 7ee75fef18c21275cf29740a6fdd81ea90e41f45 (diff) | |
| download | ninja-5e8faa47e1b2507a09d04fea4325006e5eab2f25.tar.gz | |
Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox
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) |