aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D/snap-manager.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-11 14:07:13 -0700
committerPushkar Joshi2012-06-11 14:07:13 -0700
commit71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch)
treea432a4652bf7c96aea72a22bf27946eeee8fc4a5 /js/helper-classes/3D/snap-manager.js
parent76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff)
parent756cbfad2b98b300af8db3793aa21718b88dd950 (diff)
downloadninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js14
1 files changed, 2 insertions, 12 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index e3756f32..a8b6e739 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -481,10 +481,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
481 { 481 {
482 var snapRec = this._elementCache[i]; 482 var snapRec = this._elementCache[i];
483 var elt = snapRec.getElement(); 483 var elt = snapRec.getElement();
484 if (elt.elementModel) 484 elt.elementModel.isIn2DSnapCache = false;
485 elt.elementModel.isIn2DSnapCache = false; 485
486 else
487 console.log( "element in the 2D cache does not have an elementModel" );
488 } 486 }
489 487
490 this._elementCache = null; 488 this._elementCache = null;
@@ -541,10 +539,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
541 snapRec.init( elt ); 539 snapRec.init( elt );
542 this._elementCache.push( snapRec ); 540 this._elementCache.push( snapRec );
543 541
544 if (!elt.elementModel)
545 {
546 NJUtils.makeModelFromElement(elt);
547 }
548 elt.elementModel.isIn2DSnapCache = true; 542 elt.elementModel.isIn2DSnapCache = true;
549 } 543 }
550 else if (elt.elementModel) 544 else if (elt.elementModel)
@@ -613,10 +607,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
613 snapRec.init( elt ); 607 snapRec.init( elt );
614 this._elementCache.push( snapRec ); 608 this._elementCache.push( snapRec );
615 609
616 if (!elt.elementModel)
617 {
618 NJUtils.makeModelFromElement(elt);
619 }
620 elt.elementModel.isIn2DSnapCache = true; 610 elt.elementModel.isIn2DSnapCache = true;
621 } 611 }
622 else if (elt.elementModel) 612 else if (elt.elementModel)