diff options
| author | hwc487 | 2012-05-11 11:28:15 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 11:28:15 -0700 |
| commit | 634194bf87744dd6f693380ec878cc5dd42207a1 (patch) | |
| tree | 9652bf677abb71b56582deb9c46fb2dcb7d9a687 /js/lib/geom/brush-stroke.js | |
| parent | d1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (diff) | |
| parent | e2ef92008a39a67d4f7db0627c7352bdc06ed476 (diff) | |
| download | ninja-634194bf87744dd6f693380ec878cc5dd42207a1.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Conflicts:
js/lib/geom/circle.js
js/lib/geom/rectangle.js
Diffstat (limited to 'js/lib/geom/brush-stroke.js')
| -rwxr-xr-x | js/lib/geom/brush-stroke.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js index 1fae0c1d..6facdd5d 100755 --- a/js/lib/geom/brush-stroke.js +++ b/js/lib/geom/brush-stroke.js | |||
| @@ -768,7 +768,7 @@ var BrushStroke = function GLBrushStroke() { | |||
| 768 | 768 | ||
| 769 | }; //function BrushStroke ...class definition | 769 | }; //function BrushStroke ...class definition |
| 770 | 770 | ||
| 771 | BrushStroke.prototype = new GeomObj(); | 771 | BrushStroke.prototype = Object.create(GeomObj, {}); |
| 772 | 772 | ||
| 773 | BrushStroke.prototype._CatmullRomSplineInterpolate = function(ctrlPts, t) | 773 | BrushStroke.prototype._CatmullRomSplineInterpolate = function(ctrlPts, t) |
| 774 | { | 774 | { |