From ae7eb87564632ce7c676bd728b8ff2710ff0bb83 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 18 Apr 2012 15:44:26 -0700
Subject: Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
 into Snapping_II

Conflicts:
	js/tools/Rotate3DToolBase.js
	js/tools/RotateStage3DTool.js
	js/tools/Translate3DToolBase.js
	js/tools/modifier-tool-base.js
---
 js/lib/rdge/materials/pulse-material.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/js/lib/rdge/materials/pulse-material.js b/js/lib/rdge/materials/pulse-material.js
index 9cb500c8..4ba5110e 100644
--- a/js/lib/rdge/materials/pulse-material.js
+++ b/js/lib/rdge/materials/pulse-material.js
@@ -25,8 +25,9 @@ var PulseMaterial = function PulseMaterial()
 	this._name = "PulseMaterial";
 	this._shaderName = "pulse";
 
-	//this._texMap = 'assets/images/cubelight.png';
-	this._texMap = 'texture';
+	this._texMap = 'assets/images/cubelight.png';
+	//this._texMap = 'assets/images/cloud10.png';
+	//this._texMap = 'texture';
 
 	this._time = 0.0;
 	this._dTime = 0.01;
-- 
cgit v1.2.3