Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

1 files changed, 4 insertions, 1 deletions

diff --git a/js/helper-classes/backup-delete/Materials/PulseMaterial.js b/js/helper-classes/backup-delete/Materials/PulseMaterial.js
index d76b9966..e55798b7 100644
--- a/js/helper-classes/backup-delete/Materials/PulseMaterial.js
+++ b/js/helper-classes/backup-delete/Materials/PulseMaterial.js
@@ -105,7 +105,7 @@ function PulseMaterial()
                 this._shader.init();
 
                 // set up the material node
-                this._materialNode = createMaterialNode("pulseMaterial");
+                this._materialNode = createMaterialNode("pulseMaterial_" + world.generateUniqueNodeID());
                 this._materialNode.setShader(this._shader);
 
                 this._time = 0;
@@ -185,6 +185,9 @@ function PulseMaterial()
                 // every material needs the base type and instance name
                 var exportStr = "material: " + this.getShaderName() + "\n";
                 exportStr += "name: " + this.getName() + "\n";
+
+                var texMapName = this._propValues[this._propNames[0]];
+                exportStr += "texture: " + texMapName + "\n";
                 
                 // every material needs to terminate like this
                 exportStr += "endMaterial\n";