Merge branch 'refs/heads/integration' into FileIO-Integration

Conflicts:
	js/document/html-document.js

1 files changed, 6 insertions, 2 deletions

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 1e3137eb..8ad78bd4 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -179,8 +179,12 @@ var PulseMaterial = function PulseMaterial() {
                 var exportStr = "material: " + this.getShaderName() + "\n";
                 exportStr += "name: " + this.getName() + "\n";
 
-                var texMapName = this._propValues[this._propNames[0]];
-                exportStr += "texture: " + texMapName + "\n";
+                var world = this.getWorld();
+                if (!world)
+                        throw new Error( "no world in material.export, " + this.getName() );
+
+                var texMapName =  world.cleansePath( this._propValues[this._propNames[0]] );
+                exportStr += "texture: " +texMapName + "\n";
                 
                 // every material needs to terminate like this
                 exportStr += "endMaterial\n";