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/texture.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'js/lib/rdge/texture.js')

diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js
index 628f22ba..e0bf3364 100644
--- a/js/lib/rdge/texture.js
+++ b/js/lib/rdge/texture.js
@@ -205,7 +205,6 @@ function Texture( dstWorld, texMapName,  wrap, mips )
 		}
 		var renderer = world.getRenderer();
 
-		var imageData;
 		var width = srcCanvas.width,  height = srcCanvas.height;
 		if (!this.isPowerOfTwo(width) || !this.isPowerOfTwo(height))
 		{
-- 
cgit v1.2.3