diff options
| author | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-11 10:12:08 -0700 |
| commit | 6a3b09433b8d5894a0f2a6c00748825727c2d991 (patch) | |
| tree | 377cd68e0580172bc234059dbd4482c964d49bd4 /js/helper-classes/3D/snap-manager.js | |
| parent | 79cbc26904a7fbd7a846f48da6c026a91221ba93 (diff) | |
| parent | bad5a44824ba35cbc7f4f4d245e32b90208f00c1 (diff) | |
| download | ninja-6a3b09433b8d5894a0f2a6c00748825727c2d991.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
| -rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 14 |
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) |