aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-27 15:43:51 -0700
committerNivesh Rajbhandari2012-03-27 15:43:51 -0700
commitb5d16f318e23a98d2b75afb902a7d0da6d18a10d (patch)
treec071597f11ae399fe98661c1ca6a3b86d080db4d /js/tools
parentb1eb3f5cc37f6e58e765f24221c3f0445a3ee75a (diff)
parent675fffb08f570783f055471501f94fc273de2b9e (diff)
downloadninja-b5d16f318e23a98d2b75afb902a7d0da6d18a10d.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/EyedropperTool.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 7458a9e8..d627f03b 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -395,9 +395,12 @@ exports.EyedropperTool = Montage.create(toolBase, {
395 this._webGlWorld.importJSON(worldData); 395 this._webGlWorld.importJSON(worldData);
396 this._webGlWorld.render(); 396 this._webGlWorld.render();
397 setTimeout(function() { 397 setTimeout(function() {
398 this._webGlWorld.draw(); 398 if(this._webGlWorld)
399 this._imageDataContext.drawImage(this._webGlDataCanvas, 0, 0); 399 {
400 return this._getColorFromCanvas(this._imageDataContext, tmpPt, true); 400 this._webGlWorld.draw();
401 this._imageDataContext.drawImage(this._webGlDataCanvas, 0, 0);
402 return this._getColorFromCanvas(this._imageDataContext, tmpPt, true);
403 }
401 }.bind(this), 250); 404 }.bind(this), 250);
402 } 405 }
403 } 406 }