Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 2 insertions, 0 deletions

diff --git a/js/helper-classes/backup-delete/GLRectangle.js b/js/helper-classes/backup-delete/GLRectangle.js
index a801d3c4..2caa7080 100755
--- a/js/helper-classes/backup-delete/GLRectangle.js
+++ b/js/helper-classes/backup-delete/GLRectangle.js
@@ -166,6 +166,8 @@ function GLRectangle()
                         rtnStr += "flatMaterial";
                 rtnStr += "\n";
 
+                rtnStr += this.exportMaterials();
+
                 return rtnStr;
         }