diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-26 12:58:15 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-26 12:58:15 +0400 |
commit | c301a059bd59672daf022755181f114ce70a21e9 (patch) | |
tree | 3819a1a1a6f647a1def1279bcd293df8b34d2534 /source/blender/src/editcurve.c | |
parent | 5adff90b0868f88050e601092b35628fa3ae132b (diff) | |
parent | 06a5e9b58a0c1281609ee1ddb850fc058fe56c4f (diff) |
svn merge -r 16667:16741 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/src/editcurve.c')
-rw-r--r-- | source/blender/src/editcurve.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c index f15ffcdcb58..1dee0837445 100644 --- a/source/blender/src/editcurve.c +++ b/source/blender/src/editcurve.c @@ -1727,7 +1727,7 @@ void subdivideNurb() */ /* count */ if(nu->flagu & CU_CYCLIC) { - a= nu->pntsu*nu->pntsv; + a= nu->pntsu; bp= nu->bp; prevbp= bp+(a-1); } @@ -2145,7 +2145,7 @@ int convertspline(short type, Nurb *nu) nu->type |= 1; calchandlesNurb(nu); } - else if(type==4) { /* to Nurb */ + else if(type==CU_NURBS) { nu->type &= ~7; nu->type+= 4; nu->orderu= 4; |