From 25a2e1c5eb21a18caccc7a9435d835a3f5e7f3a0 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 14 May 2012 10:37:03 -0700
Subject: More merge problems

---
 js/lib/geom/geom-obj.js  |  2 --
 js/lib/geom/rectangle.js | 13 +++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'js/lib')

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 );
-- 
cgit v1.2.3