aboutsummaryrefslogtreecommitdiff
path: root/js/tools/Rotate3DToolBase.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-09 13:23:07 -0800
committerNivesh Rajbhandari2012-02-09 13:23:07 -0800
commit148e6f7c00e54b0ec6fa6bb6791f0ac0920af511 (patch)
tree889719cf024d73e2e1e93d73a40f96a2a8d27dc6 /js/tools/Rotate3DToolBase.js
parenta9a02ef8a206082ea9ea0cb66f3fb70e1f4256df (diff)
parent666ae3e9119410cbf7fa974274d95336aaff091c (diff)
downloadninja-148e6f7c00e54b0ec6fa6bb6791f0ac0920af511.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Conflicts: js/helper-classes/RDGE/GLMaterial.js js/helper-classes/RDGE/GLRectangle.js js/helper-classes/RDGE/GLWorld.js js/helper-classes/RDGE/Materials/FlatMaterial.js js/helper-classes/RDGE/Materials/IridescentScalesMaterial.js js/helper-classes/RDGE/Materials/JuliaMaterial.js js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js js/helper-classes/RDGE/Materials/MandelMaterial.js js/helper-classes/RDGE/Materials/PlasmaMaterial.js js/helper-classes/RDGE/Materials/PulseMaterial.js js/helper-classes/RDGE/Materials/RadialBlurMaterial.js js/helper-classes/RDGE/Materials/RadialGradientMaterial.js js/helper-classes/RDGE/Materials/TunnelMaterial.js js/helper-classes/RDGE/Materials/TwistMaterial.js js/helper-classes/RDGE/rdge-compiled.js js/helper-classes/RDGE/src/core/script/renderer.js js/panels/Materials/Materials.xml Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/Rotate3DToolBase.js')
-rw-r--r--js/tools/Rotate3DToolBase.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tools/Rotate3DToolBase.js b/js/tools/Rotate3DToolBase.js
index 6e17864b..aa91b2f4 100644
--- a/js/tools/Rotate3DToolBase.js
+++ b/js/tools/Rotate3DToolBase.js
@@ -254,7 +254,7 @@ exports.Rotate3DToolBase = Montage.create(ModifierToolBase, {
254 captureSelectionDrawn: { 254 captureSelectionDrawn: {
255 value: function(event){ 255 value: function(event){
256 this._origin = null; 256 this._origin = null;
257 this._targets = null; 257 this._targets = [];
258 this._startOriginArray = null; 258 this._startOriginArray = null;
259 259
260 var len = this.application.ninja.selectedElements.length; 260 var len = this.application.ninja.selectedElements.length;