Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts: js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/runtime/GLRuntime.js js/helper-classes/RDGE/src/core/script/MeshManager.js js/helper-classes/RDGE/src/core/script/engine.js js/helper-classes/RDGE/src/core/script/fx/ssao.js js/helper-classes/RDGE/src/core/script/init_state.js js/helper-classes/RDGE/src/core/script/run_state.js js/helper-classes/RDGE/src/core/script/scenegraphNodes.js js/helper-classes/RDGE/src/core/script/utilities.js js/helper-classes/RDGE/src/tools/compile-rdge-core.bat js/helper-classes/RDGE/src/tools/compile-rdge-core.sh js/helper-classes/RDGE/src/tools/rdge-compiled.js js/lib/drawing/world.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/deform-material.js js/lib/rdge/materials/flat-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/linear-gradient-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-blur-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/relief-tunnel-material.js js/lib/rdge/materials/square-tunnel-material.js js/lib/rdge/materials/star-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/tunnel-material.js js/lib/rdge/materials/twist-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/uber-material.js js/lib/rdge/materials/water-material.js js/lib/rdge/materials/z-invert-material.js js/preloader/Preloader.js
author: John Mayhew 2012-04-02 16:28:39 -0700
committer: John Mayhew 2012-04-02 16:28:39 -0700
commit: b4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree: 3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/lib/rdge/materials/relief-tunnel-material.js
parent: 5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent: c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download: ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js
index 7bf780fe..1fcdee5e 100644
--- a/js/lib/rdge/materials/relief-tunnel-material.js
+++ b/js/lib/rdge/materials/relief-tunnel-material.js
@@ -54,7 +54,7 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() {
                this._shader.init();
                // set up the material node
-                this._materialNode = RDGE.createMaterialNode("reliefTunnelMaterial");
+                this._materialNode = RDGE.createMaterialNode("reliefTunnelMaterial" + "_" + world.generateUniqueNodeID());
                this._materialNode.setShader(this._shader);
                this._time = 0;
author	John Mayhew	2012-04-02 16:28:39 -0700
committer	John Mayhew	2012-04-02 16:28:39 -0700
commit	b4155fb4c33675a8a7cd37473513718043fdf0ba (patch)
tree	3d8c802473f2395d53d599ec9d8b70b60a4db50c /js/lib/rdge/materials/relief-tunnel-material.js
parent	5ba9aeac94c86049423fd5d4b37b277263939c13 (diff)
parent	c6de22bf42be90b403491b5f87b1818d9020310c (diff)
download	ninja-b4155fb4c33675a8a7cd37473513718043fdf0ba.tar.gz

diff --git a/js/lib/rdge/materials/relief-tunnel-material.js b/js/lib/rdge/materials/relief-tunnel-material.js index 7bf780fe..1fcdee5e 100644 --- a/js/lib/rdge/materials/relief-tunnel-material.js +++ b/js/lib/rdge/materials/relief-tunnel-material.js
@@ -54,7 +54,7 @@ var ReliefTunnelMaterial = function ReliefTunnelMaterial() {
54	this._shader.init();	54	this._shader.init();
55		55
56	// set up the material node	56	// set up the material node
57	this._materialNode = RDGE.createMaterialNode("reliefTunnelMaterial");	57	this._materialNode = RDGE.createMaterialNode("reliefTunnelMaterial" + "_" + world.generateUniqueNodeID());
58	this._materialNode.setShader(this._shader);	58	this._materialNode.setShader(this._shader);
59		59
60	this._time = 0;	60	this._time = 0;