Merge branch 'refs/heads/montage-integration' into WebGL-Animation-CheckBox

3 files changed, 6 insertions, 2 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index fb787256..fd833e4b 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -732,6 +732,8 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
         }
 };
 
+
+
 World.prototype.exportJSON = function()
 {
         // world properties
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() {
         this.exportMaterialsJSON = function()
         {
                 var jObj;
-                if (this._materialArray && this._materialNodeArray)
+                if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL())
                 {
                         var nMats = this._materialArray.length;
                         if (nMats > 0)
diff --git a/js/lib/geom/rectangle.js b/js/lib/geom/rectangle.js
index 38e428bd..e511d5f4 100755
--- a/js/lib/geom/rectangle.js
+++ b/js/lib/geom/rectangle.js
@@ -187,7 +187,8 @@ var Rectangle = function GLRectangle() {
         ///////////////////////////////////////////////////////////////////////
         // Methods
         ///////////////////////////////////////////////////////////////////////
-        this.export = function() {
+        /*
+    this.export = function() {
                 var rtnStr = "type: " + this.geomType() + "\n";
 
                 /////////////////////////////////////////////////////////////////////////
@@ -243,6 +244,7 @@ var Rectangle = function GLRectangle() {
 
                 return rtnStr;
         };
+    */
 
         // JSON export
         this.exportJSON = function()