diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/lib/geom/sub-path.js | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/lib/geom/sub-path.js')
| -rwxr-xr-x | js/lib/geom/sub-path.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/geom/sub-path.js b/js/lib/geom/sub-path.js index 56c94df3..4c5fe1eb 100755 --- a/js/lib/geom/sub-path.js +++ b/js/lib/geom/sub-path.js | |||
| @@ -232,7 +232,7 @@ var GLSubpath = function GLSubpath() { | |||
| 232 | 232 | ||
| 233 | }; //function GLSubpath ...class definition | 233 | }; //function GLSubpath ...class definition |
| 234 | 234 | ||
| 235 | GLSubpath.prototype = new GeomObj(); | 235 | GLSubpath.prototype = Object.create(GeomObj, {}); |
| 236 | 236 | ||
| 237 | ///////////////////////////////////////////////////////// | 237 | ///////////////////////////////////////////////////////// |
| 238 | // Property Accessors/Setters | 238 | // Property Accessors/Setters |