diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/lib/geom/sub-path.js | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
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 |