diff options
author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/helper-classes/backup-delete/GLRectangle.js | |
parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/helper-classes/backup-delete/GLRectangle.js')
-rwxr-xr-x | js/helper-classes/backup-delete/GLRectangle.js | 2 |
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() | |||
166 | rtnStr += "flatMaterial"; | 166 | rtnStr += "flatMaterial"; |
167 | rtnStr += "\n"; | 167 | rtnStr += "\n"; |
168 | 168 | ||
169 | rtnStr += this.exportMaterials(); | ||
170 | |||
169 | return rtnStr; | 171 | return rtnStr; |
170 | } | 172 | } |
171 | 173 | ||