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

1 files changed, 0 insertions, 1 deletions

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))
                 {