aboutsummaryrefslogtreecommitdiff
path: root/js/lib/geom/brush-stroke.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/lib/geom/brush-stroke.js
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/lib/geom/brush-stroke.js')
-rwxr-xr-xjs/lib/geom/brush-stroke.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js
index 519e0433..09a7023c 100755
--- a/js/lib/geom/brush-stroke.js
+++ b/js/lib/geom/brush-stroke.js
@@ -835,7 +835,7 @@ var BrushStroke = function GLBrushStroke() {
835 835
836}; //function BrushStroke ...class definition 836}; //function BrushStroke ...class definition
837 837
838BrushStroke.prototype = new GeomObj(); 838BrushStroke.prototype = Object.create(GeomObj, {});
839 839
840BrushStroke.prototype._CatmullRomSplineInterpolate = function(ctrlPts, t) 840BrushStroke.prototype._CatmullRomSplineInterpolate = function(ctrlPts, t)
841{ 841{