More merge problems

2 files changed, 7 insertions, 8 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,
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 22cbb5d4..ab0d7022 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -14,13 +14,12 @@ var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 //      Derived from class GeomObj
 ///////////////////////////////////////////////////////////////////////
 exports.Rectangle = Object.create(GeomObj, {
-{
-        if (!MaterialsModel)
-                MaterialsModel = require("js/models/materials-model").MaterialsModel;
-
         // CONSTANTS
         N_TRIANGLES: { value : 15, writable: false },       // TODO - This is not being used anywhere. Remove?
 
+        //if (!MaterialsModel)
+        //      MaterialsModel = require("js/models/materials-model").MaterialsModel;
+
         ///////////////////////////////////////////////////////////////////////
         // Instance variables
         ///////////////////////////////////////////////////////////////////////
@@ -1180,8 +1179,10 @@ RectangleStroke.create = function( rectCtr,  width, height, strokeWidth,  tlRad,
         }
 
         //refine the mesh for vertex deformations
-        if (material) {
-                if (material.hasVertexDeformation()) {
+        if (material)
+        {
+                if (material.hasVertexDeformation())
+                {
                         var paramRange = material.getVertexDeformationRange();
                         var tolerance = material.getVertexDeformationTolerance();
                         nVertices = ShapePrimitive.refineMesh( this.vertices, this.normals, this.uvs, this.indices, nVertices,  paramRange,  tolerance );