Revision: 17774 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17774 Author: campbellbarton Date: 2008-12-10 12:42:26 +0100 (Wed, 10 Dec 2008)
Log Message: ----------- fix for [18069] open nurbs curve snaps end to centerpoint made nurbs surface curves use the same number of points as nurbs curves. Modified Paths: -------------- trunk/blender/source/blender/blenkernel/intern/curve.c trunk/blender/source/blender/blenkernel/intern/displist.c Modified: trunk/blender/source/blender/blenkernel/intern/curve.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/curve.c 2008-12-10 09:45:48 UTC (rev 17773) +++ trunk/blender/source/blender/blenkernel/intern/curve.c 2008-12-10 11:42:26 UTC (rev 17774) @@ -833,7 +833,6 @@ sum= (float *)MEM_callocN(sizeof(float)*len, "makeNurbcurve1"); resolu= (resolu*SEGMENTSU(nu)); - if((nu->flagu & CU_CYCLIC)==0) resolu++; if(resolu==0) { MEM_freeN(sum); @@ -1685,7 +1684,6 @@ else if((nu->type & 7)==CU_NURBS) { if(nu->pntsv==1) { len= (resolu*SEGMENTSU(nu)); - if((nu->flagu & CU_CYCLIC)==0) len++; bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList3"); BLI_addtail(&(cu->bev), bl); Modified: trunk/blender/source/blender/blenkernel/intern/displist.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/displist.c 2008-12-10 09:45:48 UTC (rev 17773) +++ trunk/blender/source/blender/blenkernel/intern/displist.c 2008-12-10 11:42:26 UTC (rev 17774) @@ -887,7 +887,6 @@ } else if((nu->type & 7)==CU_NURBS) { len= (resolu*SEGMENTSU(nu)); - if((nu->flagu & CU_CYCLIC)==0) len++; dl= MEM_callocN(sizeof(DispList), "makeDispListsurf"); dl->verts= MEM_callocN(len*3*sizeof(float), "dlverts"); @@ -1381,7 +1380,7 @@ for (nu=nubase->first; nu; nu=nu->next) { if(forRender || nu->hide==0) { if(nu->pntsv==1) { - len= nu->pntsu*nu->resolu; + len= SEGMENTSU(nu)*nu->resolu; dl= MEM_callocN(sizeof(DispList), "makeDispListsurf"); dl->verts= MEM_callocN(len*3*sizeof(float), "dlverts"); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs