diff options
| author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
| commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
| tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/helper-classes/3D/snap-manager.js | |
| parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
| -rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index ada6960b..94202dc5 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
| @@ -521,7 +521,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 521 | 521 | ||
| 522 | if (!elt.elementModel) | 522 | if (!elt.elementModel) |
| 523 | { | 523 | { |
| 524 | NJUtils.makeElementModel2(elt); | 524 | NJUtils.makeModelFromElement(elt); |
| 525 | } | 525 | } |
| 526 | elt.elementModel.isIn2DSnapCache = true; | 526 | elt.elementModel.isIn2DSnapCache = true; |
| 527 | } | 527 | } |
| @@ -588,7 +588,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 588 | 588 | ||
| 589 | if (!elt.elementModel) | 589 | if (!elt.elementModel) |
| 590 | { | 590 | { |
| 591 | NJUtils.makeElementModel2(elt); | 591 | NJUtils.makeModelFromElement(elt); |
| 592 | } | 592 | } |
| 593 | elt.elementModel.isIn2DSnapCache = true; | 593 | elt.elementModel.isIn2DSnapCache = true; |
| 594 | } | 594 | } |