More merge problems

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, {
             if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) {
                 var nMats = this._materialArray.length;
                 if (nMats > 0) {
-                                {
                     var arr = [];
 
                     for (var i = 0; i < nMats; i++) {
-                                        {
                         var matObj =
                         {
                             'materialNodeName':this._materialNodeArray[i].name,