diff options
author | hwc487 | 2012-05-14 10:37:03 -0700 |
---|---|---|
committer | hwc487 | 2012-05-14 10:37:03 -0700 |
commit | 25a2e1c5eb21a18caccc7a9435d835a3f5e7f3a0 (patch) | |
tree | e1de3241cebd49cadecfae0f59f09ef700ca9d30 /js/lib/geom/geom-obj.js | |
parent | 5fcb96cae89007c684df3ce948831e2fcf9fd8b7 (diff) | |
download | ninja-25a2e1c5eb21a18caccc7a9435d835a3f5e7f3a0.tar.gz |
More merge problems
Diffstat (limited to 'js/lib/geom/geom-obj.js')
-rwxr-xr-x | js/lib/geom/geom-obj.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index 6f37ad1c..6b73463f 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
@@ -325,11 +325,9 @@ exports.GeomObj = Object.create(Object.prototype, { | |||
325 | if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) { | 325 | if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) { |
326 | var nMats = this._materialArray.length; | 326 | var nMats = this._materialArray.length; |
327 | if (nMats > 0) { | 327 | if (nMats > 0) { |
328 | { | ||
329 | var arr = []; | 328 | var arr = []; |
330 | 329 | ||
331 | for (var i = 0; i < nMats; i++) { | 330 | for (var i = 0; i < nMats; i++) { |
332 | { | ||
333 | var matObj = | 331 | var matObj = |
334 | { | 332 | { |
335 | 'materialNodeName':this._materialNodeArray[i].name, | 333 | 'materialNodeName':this._materialNodeArray[i].name, |