From 818582d389f504c915be0c9052fafa33e3e76c92 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 7 Mar 2012 16:48:48 -0800
Subject: File IO

---
 js/lib/rdge/materials/radial-blur-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/lib/rdge/materials/radial-blur-material.js')

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 41e68182..89116af4 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -94,7 +94,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 		this._shader.init();
 
 		// set up the material node
-		this._materialNode = createMaterialNode("radialBlurMaterial");
+		this._materialNode = createMaterialNode("radialBlurMaterial" + "_" + world.generateUniqueNodeID());
 		this._materialNode.setShader(this._shader);
 
 		this._time = 0;
-- 
cgit v1.2.3


From 4f7590251dd0fa4c07e04fd1f7fc927d9223c9b4 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 8 Mar 2012 09:32:06 -0800
Subject: Fix for runtime Radial blur material

---
 js/lib/rdge/materials/radial-blur-material.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'js/lib/rdge/materials/radial-blur-material.js')

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 89116af4..d0d05e8d 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -161,6 +161,9 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 		// 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";
-- 
cgit v1.2.3


From 7b6e8194b91168abdeb94702eb350d14f147858b Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 8 Mar 2012 17:29:18 -0800
Subject: Canvas IO

---
 js/lib/rdge/materials/radial-blur-material.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'js/lib/rdge/materials/radial-blur-material.js')

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index d0d05e8d..f23f0712 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -162,7 +162,11 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 		var exportStr = "material: " + this.getShaderName() + "\n";
 		exportStr += "name: " + this.getName() + "\n";
 
-		var texMapName = this._propValues[this._propNames[0]];
+		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
-- 
cgit v1.2.3


From e92a6da7b84c58803489d70efedf74837ddfe4cd Mon Sep 17 00:00:00 2001
From: hwc487
Date: Fri, 9 Mar 2012 13:34:09 -0800
Subject: Removed asset path replacement at authortime.

---
 js/lib/rdge/materials/radial-blur-material.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/lib/rdge/materials/radial-blur-material.js')

diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index f23f0712..46cdda74 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -166,7 +166,7 @@ var RadialBlurMaterial = function RadialBlurMaterial() {
 		if (!world)
 			throw new Error( "no world in material.export, " + this.getName() );
 
-		var texMapName =  world.cleansePath( this._propValues[this._propNames[0]] );
+		var texMapName =  this._propValues[this._propNames[0]];
 		exportStr += "texture: " + texMapName + "\n";
 		
 		// every material needs to terminate like this
-- 
cgit v1.2.3